[Libreoffice-commits] core.git: 4 commits - autogen.sh distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf sw/source
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Tue Sep 22 02:25:45 PDT 2015
autogen.sh | 2
distro-configs/OxygenOfficeLinux.conf | 66 ------------------------
distro-configs/OxygenOfficeWin32.conf | 35 ------------
sw/source/core/doc/DocumentStylePoolManager.cxx | 57 ++++++++++----------
4 files changed, 30 insertions(+), 130 deletions(-)
New commits:
commit 3526da14b7c49adff202f32c15948fed8b9915ea
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Tue Sep 22 11:18:57 2015 +0200
autogen.sh: Display arguments for configure without apostrophes
So one can easily c&p the list of arguments
Change-Id: I0555c58aa6aadc410a26309d6e51382eed390b2b
diff --git a/autogen.sh b/autogen.sh
index ab9c94d..f208f35 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -265,7 +265,7 @@ if (defined $ENV{NOCONFIGURE}) {
push @args, "--srcdir=$src_path";
push @args, "--enable-option-checking=$option_checking";
- print "Running ./configure with '" . join ("' '", @args), "'\n";
+ print "Running ./configure with '" . join (" ", @args), "'\n";
system ("./configure", @args) && die "Error running configure";
}
commit 05fd8cb848ecba425124d61cd76e2f9418d5378c
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Tue Sep 22 10:25:32 2015 +0200
tdf#93970 Outline indents should not affect paragraph indents
Change-Id: I4d9f32becc6e601cd5af64919d93f9580dec738c
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 9f05e17..6884491 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -195,15 +195,21 @@ namespace
SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
const SwNumFormat& rNFormat = pOutlineRule->Get( nLevel );
- if ( rNFormat.GetPositionAndSpaceMode() ==
- SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
+ SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) );
+ if ( rNFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) )
{
- SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) );
aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() );
aLR.SetTextLeft( rNFormat.GetAbsLSpace() );
- pColl->SetFormatAttr( aLR );
}
+ else
+ {
+ // tdf#93970 The indent set at the associated outline style also affects this paragraph.
+ // We don't want this here, so override it. This doesn't affect the outline style properties.
+ aLR.SetTextFirstLineOfstValue( 0 );
+ aLR.SetTextLeft( 0 );
+ }
+ pColl->SetFormatAttr( aLR );
// All paragraph styles, which are assigned to a level of the
// outline style has to have the outline style set as its list style.
commit 77104ccd7658cb8f3ac142ea9f7fabc15fc08580
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Tue Sep 22 09:57:38 2015 +0200
Remove distro-config for OxygenOffice
The project has been inactive for years. Last version was based on OpenOffice 3.
Change-Id: I0ff43a6e9b11571457330016091f4409432ab47b
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
deleted file mode 100644
index 6ebf011..0000000
--- a/distro-configs/OxygenOfficeLinux.conf
+++ /dev/null
@@ -1,66 +0,0 @@
---with-vendor=OxygenOffice Professional Team
---with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
---with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
---with-intro-progressbar-color=15,52,122
---with-intro-progressbar-size=430,5
---with-intro-progressbar-position=5,210
---with-intro-progressbar-frame-color=138,156,190
---enable-vba
---enable-epm
---with-package-format=rpm deb
---with-epm=internal
---disable-symbols
---enable-split-app-modules
---enable-split-opt-features
---with-linker-hash-style=both
---enable-systray
---disable-kde4
---enable-gtk
---enable-evolution2
---enable-lockdown
---with-fonts
---enable-extra-gallery
---enable-extra-template
---enable-extra-sample
---enable-extra-font
---with-lang=en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
---enable-dbus
---enable-extensions
---enable-extension-integration
---enable-ext-wiki-publisher
---enable-scripting-beanshell
---enable-scripting-javascript
---enable-ext-google-docs
---enable-ext-hunart
---enable-ext-nlpsolver
---enable-ext-numbertext
---enable-ext-typo
---enable-ext-watch-window
---enable-ext-diagram
---enable-ext-validator
---enable-ext-barcode
---enable-ext-mysql-connector
---enable-postgresql-sdbc
---with-sun-templates
---enable-neon
---with-jdk-home=/usr/local/jdk1.6.0_23/
---without-system-dicts
---without-system-zlib
---without-system-poppler
---without-system-openssl
---without-system-mesa-headers
---without-system-libxml
---without-system-jpeg
---without-system-jars
---without-system-mysql
---without-system-postgresql
---without-junit
---with-helppack-integration
---enable-odk
---enable-gstreamer-0-10
---enable-graphite
---enable-dependency-tracking
---enable-python=internal
---enable-oxygenoffice
---enable-ccache
---enable-cairo-canvas
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
deleted file mode 100644
index 42b96ae..0000000
--- a/distro-configs/OxygenOfficeWin32.conf
+++ /dev/null
@@ -1,35 +0,0 @@
---with-vendor=OxygenOffice Professional Team
---with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
---with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
---with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
---enable-vba
---disable-symbols
---enable-systray
---with-fonts
---enable-extra-gallery
---enable-extra-template
---enable-extra-sample
---enable-extra-font
---with-lang=hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
---enable-extension-integration
---enable-ext-wiki-publisher
---enable-scripting-beanshell
---enable-scripting-javascript
---enable-ext-google-docs
---enable-ext-hunart
---enable-ext-nlpsolver
---enable-ext-numbertext
---enable-ext-typo
---enable-ext-watch-window
---enable-ext-diagram
---enable-ext-validator
---enable-ext-barcode
---with-sun-templates
---disable-cairo
---with-jdk-home=/usr/local/jdk1.6.0_23/
---without-junit
---with-helppack-integration
---with-package-format=msi
---enable-cairo
---enable-graphite
---enable-dependency-tracking
commit 6dec4dce4dea643b7b6e7ab7f0513128d25882af
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Tue Sep 22 09:54:49 2015 +0200
Cleanup: Reduce indentation
Change-Id: I12359c7063d4c2f160a4410a9e529f201ed1ffcd
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 71fbb0c..9f05e17 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -184,35 +184,34 @@ namespace
DefaultFontType::CTL_TEXT, rSet );
}
- if( pColl )
+ if( !pColl )
+ return;
+
+ if( !( nOutLvlBits & ( 1 << nLevel )) )
{
- if( !( nOutLvlBits & ( 1 << nLevel )) )
+ pColl->AssignToListLevelOfOutlineStyle(nLevel);
+ if( !bHTMLMode )
{
- pColl->AssignToListLevelOfOutlineStyle(nLevel);
- if( !bHTMLMode )
+ SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
+ const SwNumFormat& rNFormat = pOutlineRule->Get( nLevel );
+
+ if ( rNFormat.GetPositionAndSpaceMode() ==
+ SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
+ ( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) )
{
- SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
- const SwNumFormat& rNFormat = pOutlineRule->Get( nLevel );
-
- if ( rNFormat.GetPositionAndSpaceMode() ==
- SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
- ( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) )
- {
- SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) );
- aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() );
- aLR.SetTextLeft( rNFormat.GetAbsLSpace() );
- pColl->SetFormatAttr( aLR );
- }
-
- // All paragraph styles, which are assigned to a level of the
- // outline style has to have the outline style set as its list style.
- SwNumRuleItem aItem(pOutlineRule->GetName());
- pColl->SetFormatAttr(aItem);
+ SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) );
+ aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() );
+ aLR.SetTextLeft( rNFormat.GetAbsLSpace() );
+ pColl->SetFormatAttr( aLR );
}
+
+ // All paragraph styles, which are assigned to a level of the
+ // outline style has to have the outline style set as its list style.
+ SwNumRuleItem aItem(pOutlineRule->GetName());
+ pColl->SetFormatAttr(aItem);
}
- pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(
- RES_POOLCOLL_TEXT ));
}
+ pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ));
}
static void lcl_SetRegister( SwDoc* pDoc, SfxItemSet& rSet, sal_uInt16 nFact,
@@ -1075,11 +1074,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
}
if( aSet.Count() )
- {
- {
- pNewColl->SetFormatAttr( aSet );
- }
- }
+ pNewColl->SetFormatAttr( aSet );
return pNewColl;
}
More information about the Libreoffice-commits
mailing list