pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix logging

Browse Source
This commit is contained in:
Elena Subbotina
2025-11-21 10:29:36 +03:00
parent cb15cc18eb
commit 42030372fe
8 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
OdfFile/Reader/Converter/measuredigits.cpp
View File

@ -41,14 +41,20 @@ namespace utils {
std::pair<double, double> GetMaxDigitSizePixelsImpl(const std::wstring & fontName, double fontSize, double dpi, long fontStyle, NSFonts::IFontManager *pFontManager)
{
if (pFontManager == NULL) return std::pair<double, double>(7., 8.);
if (pFontManager == NULL)
{
_CP_LOG_CONTINUE << " wrong FontManager" << std::endl;
return std::pair<double, double>(7., 8.);
}
int hr = FALSE;
if (FALSE == (hr = pFontManager->LoadFontByName(fontName, fontSize, fontStyle, dpi, dpi )))
{
_CP_LOG_CONTINUE << " wrong load font: " << fontName << L" " << std::to_wstring(fontSize) << L" pt";
if (FALSE == (hr = pFontManager->LoadFontByName(L"Arial", fontSize, fontStyle, dpi, dpi )))
{
_CP_LOG_CONTINUE << " wrong load font: Arial " << std::to_wstring(fontSize) << L" pt ... default set" << std::endl;
return std::pair<double, double>(7, 8);
}
}
@ -64,8 +70,11 @@ std::pair<double, double> GetMaxDigitSizePixelsImpl(const std::wstring & fontNam
//if (FALSE == (hr = pFontManager->LoadString2( std::to_wstring(i), 0, 0)))
// return std::pair<float, float>(7,8);
if (FALSE == (hr = pFontManager->LoadString2( L"0123456789" , 0, 0)))//
return std::pair<double, double>(7., 8.);
if (FALSE == (hr = pFontManager->LoadString2(L"0123456789", 0, 0)))//
{
_CP_LOG_CONTINUE << " wrong load string ... default set" << std::endl;
return std::pair<double, double>(7., 8.);
}
TBBox box;
try
@ -73,12 +82,16 @@ std::pair<double, double> GetMaxDigitSizePixelsImpl(const std::wstring & fontNam
box = pFontManager->MeasureString();
}catch(...)
{
_CP_LOG_CONTINUE << " wrong measure string ... default set" << std::endl;
return std::pair<double, double>(7.,8.);
}
if (box.fMaxX < -0xffff+1 || box.fMaxY < -0xffff+1 ||
box.fMinX > 0xffff-1 || box.fMinY > 0xffff-1)
return std::pair<double, double>(7., 8. );
if (box.fMaxX < -0xffff + 1 || box.fMaxY < -0xffff + 1 ||
box.fMinX > 0xffff - 1 || box.fMinY > 0xffff - 1)
{
_CP_LOG_CONTINUE << " wrong get box size from FontManager ... default set" << std::endl;
return std::pair<double, double>(7., 8.);
}
if (box.fMaxX - box.fMinX > maxWidth) maxWidth = box.fMaxX - box.fMinX;
if (box.fMaxY - box.fMinY > maxHeight) maxHeight = box.fMaxY - box.fMinY;
@ -90,19 +103,25 @@ std::pair<double, double> GetMaxDigitSizePixelsImpl(const std::wstring & fontNam
double width = (minWidth + 2 * maxWidth) /10. /3.;
//double width = (minWidth + 2 * maxWidth) / 5./*/36.*/ /3.;
if (width > 0.01 && maxHeight > 0.01)
return std::pair<double, double>(width, maxHeight);
else
return std::pair<double, double>(7., 8.);
if (width > 0.01 && maxHeight > 0.01)
{
_CP_LOG_CONTINUE << std::to_wstring(width) << ", " << std::to_wstring(maxHeight) << std::endl;
return std::pair<double, double>(width, maxHeight);
}
else
{
_CP_LOG_CONTINUE << " wrong size ... default set" << std::endl;
return std::pair<double, double>(7., 8.);
}
}
std::pair<double, double> GetMaxDigitSizePixels(const std::wstring & fontName, double fontSize, double dpi, long fontStyle, NSFonts::IApplicationFonts *appFonts)
{
try
{
_CP_LOG << "[info] : GetMaxDigitSizePixels...";
_CP_LOG << "[info] : GetMaxDigitSizePixels...";
try
{
if (appFonts)
{
NSFonts::IFontManager *pFontManager = appFonts->GenerateFontManager();
@ -114,15 +133,14 @@ std::pair<double, double> GetMaxDigitSizePixels(const std::wstring & fontName, d
delete pFontManager;
}
_CP_LOG << "ok" << std::endl;
return val;
}
}
catch(...)
{
// TODO: default value!
}
return std::pair<double, double>(7., 8.);
_CP_LOG_CONTINUE << " default set" << std::endl;
return std::pair<double, double>(7., 8.);
}
}

11
OdfFile/Reader/Format/styles_list.cpp
View File

@ -930,7 +930,16 @@ void text_list_level_style_image::pptx_convert(oox::pptx_conversion_context & Co
std::wstring rid = Context.get_mediaitems()->add_or_find(*image_attr_.xlink_attlist_.href_, oox::typeImage, isMediaInternal, ref_image, oox::document_place);
Context.get_slide_context().add_rels(isMediaInternal, rid, ref_image, oox::typeImage);
//a:buSzPct
if (listLevelProperties && listLevelProperties->fo_width_ && listLevelProperties->fo_height_)
{
double width_pt = listLevelProperties->fo_width_->get_value_unit(length::pt);
double height_pt = listLevelProperties->fo_height_->get_value_unit(length::pt);
CP_XML_NODE(L"a:buSzPts")
{
CP_XML_ATTR(L"val", (int)(width_pt * 100));
}
}
CP_XML_NODE(L"a:buBlip")
{
CP_XML_NODE(L"a:blip")