[Libreoffice-commits] core.git: 2 commits - filter/source sd/source
filter/source/pdf/impdialog.cxx | 21 ++---
filter/source/pdf/impdialog.hxx |5 +
sd/source/ui/dlg/prltempl.cxx |3 +--
3 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit 9150c8c09645be12849cdb5aad484ee344b7b313
Author: Caolán McNamara
AuthorDate: Sun Oct 1 15:49:27 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 1 21:10:23 2023 +0200
Resolves: tdf#157515 only remove RID_SVXPAGE_PARA_ASIAN once
Change-Id: I65faa99444636c5bc5b21008d4cfb144fbcafb83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157447
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 7ae551983b42..d7305eb446b7 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -141,7 +141,7 @@
SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh,
AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr );
AddTabPage( "RID_SVXPAGE_BKG", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BKG ), nullptr);
-if( !SvtCJKOptions::IsAsianTypographyEnabled() )
+if (!SvtCJKOptions::IsAsianTypographyEnabled() || bBackground)
RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" );
if (bBackground)
@@ -160,7 +160,6 @@
SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh,
RemoveTabPage( "RID_SVXPAGE_NUM_OPTIONS");
RemoveTabPage( "RID_SVXPAGE_TABULATOR");
RemoveTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH");
-RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" );
RemoveTabPage( "RID_SVXPAGE_BKG" );
}
commit fe2031b993721dbe40d71684f4609ee3cf018958
Author: Caolán McNamara
AuthorDate: Sun Oct 1 19:25:45 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 1 21:10:17 2023 +0200
cid#1547033 Dereference after null check
Change-Id: Id407ef300fca83167fb9813534fb099c6e56fc0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157449
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index ba412851c393..a036d432e3c3 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -413,7 +413,6 @@ void ImpPDFTabDialog::PageCreated(const OUString& rId,
SfxTabPage& rPage)
}
}
-
Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
{
// updating the FilterData sequence and storing FilterData to configuration
@@ -859,10 +858,10 @@ void ImpPDFTabGeneralPage::EnableExportNotesPages()
if ( mbIsPresentation )
{
mxCbExportNotesPages->set_sensitive(
-!mxRbSelection->get_active() &&
!mpParent->maConfigItem.IsReadOnly("ExportNotesPages"));
+!mxRbSelection->get_active() &&
!IsReadOnlyProperty("ExportNotesPages"));
mxCbExportOnlyNotesPages->set_sensitive(
!mxRbSelection->get_active() && mxCbExportNotesPages->get_active()
-&& !mpParent->maConfigItem.IsReadOnly("ExportOnlyNotesPages"));
+&& !IsReadOnlyProperty("ExportOnlyNotesPages"));
}
}
@@ -873,9 +872,9 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage,
ToggleExportFormFieldsHdl, weld::Toggleabl
mxFormsFrame->set_sensitive(bExportFormFields);
if (bExportFormFields)
{
-if (mpParent->maConfigItem.IsReadOnly("FormsType"))
+if (IsReadOnlyProperty("FormsType"))
mxLbFormsFormat->set_sensitive(false);
-if (mpParent->maConfigItem.IsReadOnly("AllowDuplicateFieldNames"))
+if (IsReadOnlyProperty("AllowDuplicateFieldNames"))
mxCbAllowDuplicateFieldNames->set_sensitive(false);
}
}
@@ -884,20 +883,20 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage,
ToggleExportNotesPagesHdl, weld::Toggleabl
{
mxCbExportOnlyNotesPages->set_sensitive(
mxCbExportNotesPages->get_active()
-&& !mpParent->maConfigItem.IsReadOnly("ExportOnlyNotesPages"));
+&& !IsReadOnlyProperty("ExportOnlyNotesPages"));
}
IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl, weld::Toggleable&,
void)
{
mxQualityFrame->set_sensitive(
-mxRbJPEGCompression->get_active() &&
!mpParent->maConfigItem.IsReadOnly("Quality"));
+mxRbJPEGCompression->get_active() && !IsReadOnlyProperty("Quality"));
}
IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl,
weld::Toggleable&, void)
{
mxCoReduceImageResolution->set_sensitive(
mxCbReduceImageResolution->get_active()
-&& !mpParent->maConfigItem.IsReadOnly("MaxImageResolution"));
+&& !IsReadOnlyProperty("MaxImageResolution"));
}
IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl, weld::Toggleable&,
void)
@@ -940,9 +939,9 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage,
TogglePDFVersionOrUniversalAccessibilityHa
pSecPage->ImplPDFASecurityControl(!bIsPDFA)
[Libreoffice-commits] core.git: 2 commits - filter/source sd/source
filter/source/msfilter/svdfppt.cxx | 13 +
sd/source/filter/eppt/pptx-text.cxx |6 ++
2 files changed, 7 insertions(+), 12 deletions(-)
New commits:
commit cdb750653e680c4c30239423ed201ed7a03eda8b
Author: Noel Grandin
AuthorDate: Tue Oct 30 13:54:13 2018 +0200
Commit: Noel Grandin
CommitDate: Wed Oct 31 07:33:55 2018 +0100
loplugin:useuniqueptr in ParagraphObj::ParagraphObj
Change-Id: I4c5dcdad18988381b64479cad077234978437795
Reviewed-on: https://gerrit.libreoffice.org/62661
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index c6c538437ee8..eef5558dbed3 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -724,11 +724,9 @@ ParagraphObj::ParagraphObj(css::uno::Reference<
css::text::XTextContent > const
css::uno::Any aAny( aXTextPortionE->nextElement() );
if ( aAny >>= aXCursorText )
{
-PortionObj* pPortionObj = new PortionObj(
aXCursorText, !aXTextPortionE->hasMoreElements(), rFontCollection );
+std::unique_ptr pPortionObj(new
PortionObj( aXCursorText, !aXTextPortionE->hasMoreElements(), rFontCollection
));
if ( pPortionObj->Count() )
-mvPortions.push_back(
std::unique_ptr(pPortionObj) );
-else
-delete pPortionObj;
+mvPortions.push_back( std::move(pPortionObj) );
}
}
}
commit 2a8f860a7199585ad8ae61cfacdc39f2ac3afdb8
Author: Noel Grandin
AuthorDate: Tue Oct 30 13:47:16 2018 +0200
Commit: Noel Grandin
CommitDate: Wed Oct 31 07:33:40 2018 +0100
loplugin:useuniqueptr in PPTTextObj::PPTTextObj
Change-Id: Ib150ecf2dbcc0e3be1d7b1d4daba6065605597ee
Reviewed-on: https://gerrit.libreoffice.org/62660
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 581788294902..ac8728cd424f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6730,7 +6730,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn,
SdrPowerPointImport& rSdrPowerPointImport
// now will search for possible textextensions
such as date/time fields
// or ParaTabStops and append them on this textobj
rIn.Seek( nFilePos );
-::std::vector< PPTFieldEntry* > FieldList;
+::std::vector< std::unique_ptr >
FieldList;
auto nEndRecPos = DffPropSet::SanitizeEndPos(rIn,
aClientTextBoxHd.GetRecEndFilePos());
while (rIn.Tell() < nEndRecPos)
{
@@ -6906,22 +6906,22 @@ PPTTextObj::PPTTextObj( SvStream& rIn,
SdrPowerPointImport& rSdrPowerPointImport
if (xEntry)
{
// sorting fields ( hi >> lo )
-::std::vector< PPTFieldEntry* >::iterator
it = FieldList.begin();
+auto it = FieldList.begin();
for( ; it != FieldList.end(); ++it ) {
if ( (*it)->nPos < xEntry->nPos ) {
break;
}
}
if ( it != FieldList.end() ) {
-FieldList.insert(it, xEntry.release());
+FieldList.insert(it,
std::move(xEntry));
} else {
-FieldList.push_back(xEntry.release());
+FieldList.push_back(
std::move(xEntry));
}
}
}
if ( !FieldList.empty() )
{
-::std::vector< PPTFieldEntry* >::iterator FE =
FieldList.begin();
+auto FE = FieldList.begin();
auto& aCharPropList =
aStyleTextPropReader.aCharPropList;
sal_Int32 i = nParagraphs - 1;
@@ -7068,9 +7068,6 @@ PPTTextObj::PPTTextObj( SvStream& rIn,
SdrPowerPointImport& rSdrPowerPointImport
}
n--;
}
-for(PPTFieldEntry* j : FieldList) {
-delete j;
-
[Libreoffice-commits] core.git: 2 commits - filter/source sd/source
filter/source/msfilter/svdfppt.cxx | 15 ++-
sd/source/filter/eppt/eppt.cxx |2 +-
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit a45a5be4876095e57bf6ce0caef28025cf92e43a
Author: Tomaž Vajngerl
Date: Sat Mar 10 15:31:09 2018 +0900
ppt export: fix use of FillBitmap instead of FillBitmapURL
Change-Id: Ic6add7910753649efd74e9b69557a5f4389b34dd
Reviewed-on: https://gerrit.libreoffice.org/51023
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 217bb4221317..eddc6edbda6b 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1208,7 +1208,7 @@ void PPTWriter::ImplWriteBackground( css::uno::Reference<
css::beans::XPropertyS
break;
case css::drawing::FillStyle_BITMAP :
-aPropOpt.CreateGraphicProperties( rXPropSet, "FillBitmapURL", true
);
+aPropOpt.CreateGraphicProperties( rXPropSet, "FillBitmap", true );
break;
case css::drawing::FillStyle_HATCH :
commit 9844d63c93e56fdb81d8ca6bbb2b67e9aa3a77c4
Author: Tomaž Vajngerl
Date: Sat Mar 10 15:26:08 2018 +0900
svdfppt: use FillBitmap and xBitmap instead of Graph.Obj. URL
Change-Id: I9b431a598b6cadab6b345ee41bdc8ed2f94b8d3a
Reviewed-on: https://gerrit.libreoffice.org/51022
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 21b335dadf53..97032a01a56c 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7455,21 +7455,18 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference< XCell > const & xCel
eFS = css::drawing::FillStyle_BITMAP;
const XFillBitmapItem
aXFillBitmapItem(pObj->GetMergedItem( XATTR_FILLBITMAP ));
-OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
-aURL += OStringToOUString(
-aXFillBitmapItem.GetGraphicObject().GetUniqueID(),
-RTL_TEXTENCODING_ASCII_US);
-
-xPropSet->setPropertyValue("FillBitmapURL", Any( aURL ) );
+uno::Reference xGraphic =
aXFillBitmapItem.GetGraphicObject().GetGraphic().GetXGraphic();
+uno::Reference xBitmap(xGraphic,
uno::UNO_QUERY);
+xPropSet->setPropertyValue("FillBitmap",
uno::makeAny(xBitmap));
const XFillBmpStretchItem
aStretchItem(pObj->GetMergedItem( XATTR_FILLBMP_STRETCH ));
const XFillBmpTileItem aTileItem(pObj->GetMergedItem(
XATTR_FILLBMP_TILE ));
if( aTileItem.GetValue() )
-xPropSet->setPropertyValue( "FillBitmapMode", Any(
css::drawing::BitmapMode_REPEAT ) );
+xPropSet->setPropertyValue("FillBitmapMode",
uno::makeAny(drawing::BitmapMode_REPEAT));
else if( aStretchItem.GetValue() )
-xPropSet->setPropertyValue( "FillBitmapMode", Any(
css::drawing::BitmapMode_STRETCH ) );
+xPropSet->setPropertyValue("FillBitmapMode",
uno::makeAny(drawing::BitmapMode_STRETCH));
else
-xPropSet->setPropertyValue( "FillBitmapMode", Any(
css::drawing::BitmapMode_NO_REPEAT ) );
+xPropSet->setPropertyValue("FillBitmapMode",
uno::makeAny(drawing::BitmapMode_NO_REPEAT));
}
break;
default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source sd/source
filter/source/graphicfilter/ieps/ieps.cxx |2 +-
sd/source/ui/view/drviews2.cxx|6 --
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d2397c08722b9acf84b7a03e1395f5391998cf84
Author: Caolán McNamara
Date: Thu Nov 2 09:00:05 2017 +
coverity#1420538 Copy-paste error
Change-Id: If85024b144f9d13da35b1f548100cf5860f3c75f
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index 6d5c41cba7d8..265349a7119d 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -765,7 +765,7 @@ ipsGraphicImport( SvStream & rStream, Graphic & rGraphic,
FilterConfigItem* )
if (!bFail)
bFail = o3tl::checked_sub(nNumb[2], nNumb[0], nWidth) ||
o3tl::checked_add(nWidth, 1L, nWidth);
if (!bFail)
-bFail = o3tl::checked_sub(nNumb[3], nNumb[1], nHeight) ||
o3tl::checked_add(nWidth, 1L, nHeight);
+bFail = o3tl::checked_sub(nNumb[3], nNumb[1], nHeight) ||
o3tl::checked_add(nHeight, 1L, nHeight);
if (!bFail && nWidth > 0 && nHeight > 0)
{
GDIMetaFile aMtf;
commit f99de44a02bae5d5e2298be821fc7bcb56bee086
Author: Caolán McNamara
Date: Thu Nov 2 08:57:16 2017 +
coverity#1420536 Unchecked dynamic_cast
Change-Id: I289f61fe7e9d6b8c37b70a8fce56090c72af9abf
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 6959bd726536..fa89000bddca 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -312,9 +312,11 @@ private:
}
const SvxFieldItem* pFieldItem = findField(rSection);
-if (pFieldItem)
+const editeng::CustomPropertyField* pCustomPropertyField =
pFieldItem ?
+dynamic_cast(pFieldItem->GetField()) :
+nullptr;
+if (pCustomPropertyField)
{
-const auto* pCustomPropertyField = dynamic_cast(pFieldItem->GetField());
OUString aKey = pCustomPropertyField->GetName();
if (aKeyCreator.isMarkingTextKey(aKey))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source sd/source
filter/source/graphicfilter/icgm/cgm.cxx |2 +-
sd/source/filter/cgm/sdcgmfilter.cxx | 28 +++-
2 files changed, 4 insertions(+), 26 deletions(-)
New commits:
commit b9789a63191830a74569ed46f4292968818b5fe2
Author: Stephan Bergmann
Date: Fri Oct 17 14:23:27 2014 +0200
There is no ExportCGM
Change-Id: I84b0d4daa3a6090aadaa7f64bdb9277efbba371f
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx
b/sd/source/filter/cgm/sdcgmfilter.cxx
index 1e9ece2..cad19cd 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString const &,
Reference< XModel > const &, sal_uInt32, Reference< XStatusIndicator > const &
);
-typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( OUString&, Reference< XModel
>&, Reference< XStatusIndicator >&, void* );
#ifdef DISABLE_DYNLOADING
@@ -112,29 +111,8 @@ bool SdCGMFilter::Import()
bool SdCGMFilter::Export()
{
-#ifdef DISABLE_DYNLOADING
// No ExportCGM function exists(!)
-return sal_False;
-#else
-::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData()
);
-boolbRet = false;
-
-if( pLibrary && mxModel.is() )
-{
-ExportCGMPointer FncCGMExport = reinterpret_cast< ExportCGMPointer >(
pLibrary->getFunctionSymbol( "ExportCGM" ) );
-
-if( FncCGMExport )
-{
-OUString aPhysicalName( mrMedium.GetPhysicalName() );
-
-CreateStatusIndicator();
-bRet = FncCGMExport( aPhysicalName, mxModel, mxStatusIndicator,
NULL );
-}
-}
-
-delete pLibrary;
-return bRet;
-#endif
+return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fc78d8dfbaaa4e9bc482e91ce4437373b1db5cff
Author: Stephan Bergmann
Date: Fri Oct 17 14:10:17 2014 +0200
Pass args by const &
Change-Id: I510e1aba6772e1f8d4013b235e95a1e5599fd601
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx
b/filter/source/graphicfilter/icgm/cgm.cxx
index 014b0c1..9e44147 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -710,7 +710,7 @@ bool CGM::Write( SvStream& rIStm )
// GraphicImport - the exported function
extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL
-ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel,
sal_uInt32 nMode, css::uno::Reference & aXStatInd )
+ImportCGM( OUString const & rFileName, uno::Reference< frame::XModel > const &
rXModel, sal_uInt32 nMode, css::uno::Reference
const & aXStatInd )
{
sal_uInt32 nStatus = 0;// retvalue == 0 -> ERROR
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx
b/sd/source/filter/cgm/sdcgmfilter.cxx
index eeb0107..1e9ece2 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -40,12 +40,12 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
-typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString&, Reference<
XModel >&, sal_uInt32, Reference< XStatusIndicator >& );
+typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( OUString const &,
Reference< XModel > const &, sal_uInt32, Reference< XStatusIndicator > const &
);
typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( OUString&, Reference< XModel
>&, Reference< XStatusIndicator >&, void* );
#ifdef DISABLE_DYNLOADING
-extern "C" sal_uInt32 ImportCGM( OUString&, Reference< XModel >&, sal_uInt32,
Reference< XStatusIndicator >& );
+extern "C" sal_uInt32 ImportCGM( OUString const &, Reference< XModel > const
&, sal_uInt32, Reference< XStatusIndicator > const & );
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source sd/source
filter/source/msfilter/svdfppt.cxx | 17 ++---
sd/source/ui/dlg/headerfooterdlg.cxx |6 +++---
2 files changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 3b45f92ba6659836572d366aeda2b5bcedcae7f0
Author: Zhe Wang
Date: Mon Jun 25 05:24:31 2012 +
Resolves: #i119985# date/time is displayed as different language
(cherry picked from commit 977a050343fc836fc3e7bd876afaee931c47252c)
Change-Id: I1f31f6731353b2d8b8fd684fc6ea29becfd4a814
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx
b/sd/source/ui/dlg/headerfooterdlg.cxx
index e3efd36..3756d86 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -638,8 +638,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage(
LanguageType &rLanguage, boo
}
}
-// and set it, or just get it from the handout master page
-GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0,
PK_HANDOUT ) );
+// #i119985# and set it, or just get it from the notes master page
+GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0,
PK_NOTES ) );
}
else
{
@@ -688,7 +688,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage(
LanguageType &rLanguage, boo
if( aFieldInfo.pFieldItem )
{
const SvxFieldData* pFieldData =
aFieldInfo.pFieldItem->GetField();
-if( pFieldData && pFieldData->ISA( SvxDateTimeField ) )
+if( pFieldData && (pFieldData->ISA( SvxDateTimeField )
|| pFieldData->ISA( SvxDateField )) )
{
break;
}
commit 8a5ad76b4e69b4ec742ed27d1825262681fb6f11
Author: Zhe Wang
Date: Mon Jun 25 05:23:47 2012 +
Related: #i119985# date/time is displayed as different language
(cherry picked from commit 2a3c87a5ea5e3308a138e461dffae19483c0184c)
Change-Id: I3ef171481b206f7a9d356110d1b4a1559cd5e837
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index fa1d06f..392e30e 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -4780,13 +4780,16 @@ sal_Bool PPTTextSpecInfoAtomInterpreter::Read(
SvStream& rIn, const DffRecordHea
}
if ( nLang )
{
-sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( nLang );
-if ( nScriptType & SCRIPTTYPE_LATIN )
-pEntry->nLanguage[ 0 ] = nLang;
-if ( nScriptType & SCRIPTTYPE_ASIAN )
-pEntry->nLanguage[ 1 ] = nLang;
-if ( nScriptType & SCRIPTTYPE_COMPLEX )
-pEntry->nLanguage[ 2 ] = nLang;
+// #i119985#, we could probably handle this better if we have a
+// place to over-ride the final language for weak
+// characters/fields to fallback to, rather than the current
+// application locale. Assuming that we can determine what the
+// default fallback language for a given .ppt, etc is during
+// load time.
+if (i == 2)
+{
+pEntry->nLanguage[ 0 ] = pEntry->nLanguage[ 1 ] =
pEntry->nLanguage[ 2 ] = nLang;
+}
}
nFlags &= ~i;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
