sc/source/core/data/documen9.cxx | 3 ++-
sw/source/uibase/app/docst.cxx | 2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx | 18 +-----------------
3 files changed, 4 insertions(+), 19 deletions(-)
New commits:
commit d4b96b45727314585d02394bb5a084393b647729
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 4 17:00:50 2014 +0200
fdo#81993: Revert "Resolves: #i119464# Update default alignment ...
... value for docx [Sub]Title"
This reverts commit acc671ec74c874ffd22803bb2ee54a1f2c027155.
The commit is clearly unnecessary:
1) commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1
appears to be a better fix for alignment
2) commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a
should have disabled the Center default in Writer already
Change-Id: Ib0cc60af037f12be0a1ab94ab32c743f7fca2b1d
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index d7dc1fc..96e5686 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1129,23 +1129,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr
rFontTable )
xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT
));
xState->setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_ASIAN ));
xState->setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_COMPLEX));
- }
- else if (sConvertedStyleName == "Title" ||
sConvertedStyleName == "Subtitle")
- {
- //set the default adjust for ParaStyle Title and
Subtitle to left
- try
- {
- uno::Reference< beans::XPropertySet > xProp(
xStyle, uno::UNO_QUERY );
- if( xProp.is() )
- {
- uno::Any aMSDefaultVal = uno::makeAny(
(sal_Int16)style::ParagraphAdjust_LEFT );
- xProp->setPropertyValue(
rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
- }
- }
- catch(...)
- {
- OSL_ENSURE( false, "Default ParaAdjust style
property could not be set");
- }
+
}
}
commit be575f31ede7aea4b09174a131cb3b7e36dfdd4d
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 4 15:29:53 2014 +0200
sw: ApplyStyle: remove highly suspicious conditional
This contradicts the test in the next line.
Change-Id: I8c762af8789cd5e116abef7be2a438fba74d669f
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index b9c27d8..cc03d2c 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -591,7 +591,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl)
}
//UUUU
- if(m_bNew && SFX_STYLE_FAMILY_FRAME == m_nFamily)
+ if(m_bNew)
{
if(SFX_STYLE_FAMILY_FRAME == m_nFamily || SFX_STYLE_FAMILY_PARA ==
m_nFamily)
{
commit 8c2301bf7575b7afbacca6bac10f5db97c73d3d6
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 4 15:10:13 2014 +0200
sc: remove debugging printf
Change-Id: I1b403d8ae081347d756145e52539445e067efa91
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index a6fc287..e366955 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -147,6 +147,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
{
OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a
secondary pool set where the DrawingLayer ItemPool is to be placed (!)");
#if 0
+ // FIXME apparently this is disabled because it breaks tests
pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool());
#endif
}
@@ -251,8 +252,8 @@ void ScDocument::DeleteDrawLayer()
if(pLocalPool && pLocalPool->GetSecondaryPool())
{
- fprintf(stderr, "RET is %p\n", pLocalPool->GetSecondaryPool());
#if 0
+ // FIXME apparently this is disabled because it breaks tests
pLocalPool->SetSecondaryPool(0);
#endif
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
