|
 |
f085be |
From 11ad475ec81353ddf87834e22e2db02c23d172d7 Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Michael Stahl <mstahl@redhat.com>
|
|
|
f085be |
Date: Mon, 4 Aug 2014 17:00:50 +0200
|
|
|
f085be |
Subject: [PATCH 078/137] fdo#81993: Revert "Resolves: #i119464# Update default
|
|
|
f085be |
alignment ...
|
|
|
f085be |
|
|
|
f085be |
... value for docx [Sub]Title"
|
|
|
f085be |
|
|
|
f085be |
This reverts commit acc671ec74c874ffd22803bb2ee54a1f2c027155.
|
|
|
f085be |
|
|
|
f085be |
The commit is clearly unnecessary:
|
|
|
f085be |
|
|
|
f085be |
1) commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1
|
|
|
f085be |
appears to be a better fix for alignment
|
|
|
f085be |
|
|
|
f085be |
2) commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a
|
|
|
f085be |
should have disabled the Center default in Writer already
|
|
|
f085be |
|
|
|
f085be |
Change-Id: Ib0cc60af037f12be0a1ab94ab32c743f7fca2b1d
|
|
|
f085be |
(cherry picked from commit d4b96b45727314585d02394bb5a084393b647729)
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10734
|
|
|
f085be |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f085be |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f085be |
---
|
|
|
f085be |
writerfilter/source/dmapper/StyleSheetTable.cxx | 18 +-----------------
|
|
|
f085be |
1 file changed, 1 insertion(+), 17 deletions(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
|
|
|
f085be |
index 329cc63..2f48513 100644
|
|
|
f085be |
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
|
|
|
f085be |
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
|
|
|
f085be |
@@ -1118,23 +1118,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
|
|
|
f085be |
xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT ));
|
|
|
f085be |
xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT_ASIAN ));
|
|
|
f085be |
xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT_COMPLEX));
|
|
|
f085be |
- }
|
|
|
f085be |
- else if (sConvertedStyleName == "Title" || sConvertedStyleName == "Subtitle")
|
|
|
f085be |
- {
|
|
|
f085be |
- //set the default adjust for ParaStyle Title and Subtitle to left
|
|
|
f085be |
- try
|
|
|
f085be |
- {
|
|
|
f085be |
- uno::Reference< beans::XPropertySet > xProp( xStyle, uno::UNO_QUERY );
|
|
|
f085be |
- if( xProp.is() )
|
|
|
f085be |
- {
|
|
|
f085be |
- uno::Any aMSDefaultVal = uno::makeAny( (sal_Int16)style::ParagraphAdjust_LEFT );
|
|
|
f085be |
- xProp->setPropertyValue( rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
|
|
|
f085be |
- }
|
|
|
f085be |
- }
|
|
|
f085be |
- catch(...)
|
|
|
f085be |
- {
|
|
|
f085be |
- OSL_ENSURE( false, "Default ParaAdjust style property could not be set");
|
|
|
f085be |
- }
|
|
|
f085be |
+
|
|
|
f085be |
}
|
|
|
f085be |
}
|
|
|
f085be |
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|