date:20111023

[Libreoffice-commits] .: sc/inc sc/source

2011-10-23 Thread Andras Timar

 sc/inc/sc.hrc |   10 --
 sc/source/ui/src/scstring.src |   40 
 2 files changed, 50 deletions(-)

New commits:
commit f4f4d9d29e098b64878301b544863ca6e2bbef26
Author: Andras Timar ati...@suse.com
Date:   Sun Oct 23 10:59:38 2011 +0200

remove unused UI strings

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 1edeba2..020f7e8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -796,7 +796,6 @@
 #define SCSTR_APDTABLE  (STR_START + 27)
 #define SCSTR_RENAMETAB (STR_START + 28)
 #define STR_INSERTGRAPHIC   (STR_START + 29)
-#define SCSTR_APPLICATION   (STR_START + 31)
 #define SCSTR_DOCSHELL  (STR_START + 32)
 #define SCSTR_TABVIEWSHELL  (STR_START + 33)
 #define SCSTR_EDITSHELL (STR_START + 34)
@@ -836,18 +835,12 @@
 #define SCSTR_FIELDSEP  (STR_START + 61)
 #define SCSTR_TEXTSEP   (STR_START + 62)
 
-#define SCSTR_30_APPLICATION(STR_START + 63)
-#define SCSTR_30_LONG_DOCNAME   (STR_START + 64)
-
 #define SCSTR_CFG_INPUT (STR_START + 65)
 
 #define SCSTR_TOP10FILTER   (STR_START + 66)
 
 #define SCSTR_CFG_NAVIPI(STR_START + 67)
 
-#define SCSTR_40_APPLICATION(STR_START + 68)
-#define SCSTR_40_LONG_DOCNAME   (STR_START + 69)
-
 #define SCSTR_DRAWFORMSHELL (STR_START + 70)
 #define SCSTR_CELLSHELL (STR_START + 71)
 #define SCSTR_FORMATSHELL   (STR_START + 72)
@@ -864,8 +857,6 @@
 #define SCSTR_GRFILTER_TOOBIG(STR_START + 82)
 #define SCSTR_UNDO_GRAFFILTER(STR_START + 83)
 
-#define SCSTR_50_APPLICATION(STR_START + 84)
-#define SCSTR_50_LONG_DOCNAME   (STR_START + 85)
 #define SCSTR_CHG_PROTECT   (STR_START + 86)
 #define SCSTR_CHG_UNPROTECT (STR_START + 87)
 
@@ -952,7 +943,6 @@
 #define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
 #define STR_ACC_DOC_SPREADSHEET_READONLY(STR_START + 187)
 
-#define SCSTR_HUMAN_SCDOC_NAME  (STR_START + 210)
 #define SCSTR_SHORT_SCDOC_NAME  (STR_START + 211)
 #define SCSTR_LONG_SCDOC_NAME   (STR_START + 212)
 
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index a90bee9..c70d902 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -29,56 +29,16 @@
 
  // Strings fuer Interface-Namen --
 
-String SCSTR_APPLICATION
-{
-Text [ en-US ] = %PRODUCTNAME Calc 6.0;
-};
-
-String SCSTR_50_APPLICATION
-{
-Text [ en-US ] = StarCalc  5.0 ;
-};
-
-String SCSTR_40_APPLICATION
-{
-Text [ en-US ] = StarCalc 4.0 ;
-};
-
-String SCSTR_30_APPLICATION
-{
-Text [ en-US ] = StarCalc 3.0 ;
-};
-
 String SCSTR_LONG_SCDOC_NAME
 {
 Text [ en-US ] = %PRODUCTNAME %PRODUCTVERSION Spreadsheet;
 };
 
-String SCSTR_50_LONG_DOCNAME
-{
-Text [ en-US ] = %PRODUCTNAME 5.0 Spreadsheet ;
-};
-
-String SCSTR_40_LONG_DOCNAME
-{
-Text [ en-US ] = %PRODUCTNAME 4.0 Spreadsheet ;
-};
-
-String SCSTR_30_LONG_DOCNAME
-{
-Text [ en-US ] = StarCalc 3.0 Spreadsheet ;
-};
-
 String SCSTR_SHORT_SCDOC_NAME
 {
 Text [ en-US ] = Spreadsheet ;
 };
 
-String SCSTR_HUMAN_SCDOC_NAME
-{
-Text [ en-US ] = Spreadsheet ;
-};
-
 String SCSTR_DOCSHELL
 {
 Text [ en-US ] = Sheet ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - automation/Package_packimages.mk automation/Package_testtool.mk bean/Jar_officebean.mk desktop/Package_branding.mk desktop/Package_rcfile.mk filter/Configuration_f

2011-10-23 Thread Matus Kukan

 Repository.mk  |3 ---
 automation/Package_packimages.mk   |2 +-
 automation/Package_testtool.mk |2 +-
 bean/Jar_officebean.mk |2 +-
 desktop/Package_branding.mk|2 +-
 desktop/Package_rcfile.mk  |2 +-
 filter/Configuration_filter.mk |4 ++--
 filter/Jar_XSLTFilter.mk   |2 +-
 filter/Jar_XSLTValidate.mk |2 +-
 filter/Package_filter_generated.mk |2 +-
 i18npool/Package_generated.mk  |   10 +-
 offapi/UnoApi_offapi.mk|2 +-
 offapi/UnoApi_types.mk |2 +-
 officecfg/Configuration_officecfg.mk   |2 +-
 oovbaapi/UnoApi_oovbaapi.mk|2 +-
 qadevOOo/Jar_OOoRunner.mk  |2 +-
 qadevOOo/Jar_OOoRunnerLight.mk |2 +-
 scripting/Jar_HelloWorld.mk|2 +-
 scripting/Jar_Highlight.mk |2 +-
 scripting/Jar_MemoryUsage.mk   |2 +-
 scripting/Jar_ScriptFramework.mk   |2 +-
 scripting/Jar_ScriptProviderForBeanShell.mk|2 +-
 scripting/Jar_ScriptProviderForJava.mk |2 +-
 scripting/Jar_ScriptProviderForJavaScript.mk   |2 +-
 solenv/gbuild/Configuration.mk |   11 +++
 solenv/gbuild/CustomTarget.mk  |   12 +++-
 solenv/gbuild/Helper.mk|   13 -
 solenv/gbuild/Jar.mk   |2 +-
 solenv/gbuild/JavaClassSet.mk  |9 ++---
 solenv/gbuild/JunitTest.mk |2 +-
 solenv/gbuild/Package.mk   |2 +-
 solenv/gbuild/UnoApiTarget.mk  |4 
 swext/Configuration_mediawiki.mk   |2 +-
 swext/Jar_mediawiki.mk |2 +-
 tools/Package_reversemap.mk|2 +-
 udkapi/UnoApi_udkapi.mk|2 +-
 udkapi/UnoApi_uretypes.mk  |2 +-
 vcl/Package_afmhash.mk |2 +-
 vcl/Package_kde4moc.mk |2 +-
 wizards/Jar_agenda.mk  |2 +-
 wizards/Jar_commonwizards.mk   |2 +-
 wizards/Jar_fax.mk |2 +-
 wizards/Jar_form.mk|2 +-
 wizards/Jar_letter.mk  |2 +-
 wizards/Jar_query.mk   |2 +-
 wizards/Jar_report.mk  |2 +-
 wizards/Jar_reportbuilder.mk   |2 +-
 wizards/Jar_table.mk   |2 +-
 wizards/Jar_web.mk |2 +-
 writerfilter/Package_writerfilter_generated.mk |2 +-
 xmerge/Jar_XMergeBridge.mk |2 +-
 xmerge/Jar_aportisdoc.mk   |2 +-
 xmerge/Jar_htmlsoff.mk |2 +-
 xmerge/Jar_pexcel.mk   |2 +-
 xmerge/Jar_pocketword.mk   |2 +-
 xmerge/Jar_xmerge.mk   |2 +-
 56 files changed, 63 insertions(+), 99 deletions(-)

New commits:
commit c77a9254dde41f222bc65af957c91fa5bc166103
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Sat Oct 22 16:54:01 2011 +0200

no need for SRCDIR parameter here

diff --git a/automation/Package_packimages.mk b/automation/Package_packimages.mk
index f768372..1299cb8 100644
--- a/automation/Package_packimages.mk
+++ b/automation/Package_packimages.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,automation_packimages,$(call 
gb_CustomTarget_ge
 
 $(eval $(call 
gb_Package_add_file,automation_packimages,bin/images_tt.zip,images_tt.zip))
 
-$(eval $(call 
gb_Package_add_customtarget,automation_packimages,automation/packimages,SRCDIR))
+$(eval $(call 
gb_Package_add_customtarget,automation_packimages,automation/packimages))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,automation/packimages,\
 $(OUTDIR)/res/img/fps_officeen-US.ilst \
diff --git a/automation/Package_testtool.mk b/automation/Package_testtool.mk
index b2f0076..ea88754 100644
--- a/automation/Package_testtool.mk
+++ b/automation/Package_testtool.mk
@@ -39,7 +39,7 @@ $(eval $(call 
gb_Package_add_file,automation_testtool,bin/testtool.ini,testtool.
 
 endif
 
-$(eval $(call 
gb_Package_add_customtarget,automation_testtool,automation/source/testtool,SRCDIR))
+$(eval $(call 
gb_Package_add_customtarget,automation_testtool,automation/source/testtool))
 
 $(eval $(call gb_CustomTarget_add_dependencies,automation/source/testtool,\
 automation/source/inc/rcontrol.hxx \
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index ab38fd2..1d03e5c 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -27,7

[Libreoffice-commits] .: writerperfect/source writerperfect/StaticLibrary_writerperfect.mk

2011-10-23 Thread Fridrich Strba

 writerperfect/StaticLibrary_writerperfect.mk|1 
 writerperfect/source/filter/DocumentElement.hxx |2 
 writerperfect/source/filter/FilterInternal.hxx  |9 
 writerperfect/source/filter/FontStyle.cxx   |   42 ++
 writerperfect/source/filter/FontStyle.hxx   |   24 +
 writerperfect/source/filter/InternalHandler.hxx |2 
 writerperfect/source/filter/OdgGenerator.cxx|  110 +-
 writerperfect/source/filter/OdgGenerator.hxx|1 
 writerperfect/source/filter/OdtGenerator.cxx|  277 
 writerperfect/source/filter/Style.hxx   |   22 +
 writerperfect/source/filter/TextRunStyle.cxx|  107 +-
 writerperfect/source/filter/TextRunStyle.hxx|   49 ++
 writerperfect/source/filter/libwriterperfect_filter.cxx |   47 ++
 writerperfect/source/filter/libwriterperfect_filter.hxx |   48 ++
 14 files changed, 411 insertions(+), 330 deletions(-)

New commits:
commit 55170dd7a0cfd552a89b4bea6c7f4a9854971161
Author: Laurent Alonso alo...@loria.fr
Date:   Sun Oct 23 21:02:14 2011 +0200

Handle styles in a more intelligent way

diff --git a/writerperfect/StaticLibrary_writerperfect.mk 
b/writerperfect/StaticLibrary_writerperfect.mk
index 67e6afc..2569cba 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -55,6 +55,7 @@ $(eval $(call 
gb_StaticLibrary_add_exception_objects,writerperfect,\
writerperfect/source/filter/SectionStyle \
writerperfect/source/filter/TableStyle \
writerperfect/source/filter/TextRunStyle \
+   writerperfect/source/filter/libwriterperfect_filter \
writerperfect/source/stream/WPXSvStream \
 ))
 
diff --git a/writerperfect/source/filter/DocumentElement.hxx 
b/writerperfect/source/filter/DocumentElement.hxx
index b191de5..f56cfb2 100644
--- a/writerperfect/source/filter/DocumentElement.hxx
+++ b/writerperfect/source/filter/DocumentElement.hxx
@@ -57,7 +57,7 @@ private:
 class TagOpenElement : public TagElement
 {
 public:
-TagOpenElement(const WPXString szTagName) : TagElement(szTagName) {}
+   TagOpenElement(const WPXString szTagName) : TagElement(szTagName), 
maAttrList() {}
 virtual ~TagOpenElement() {}
 void addAttribute(const WPXString szAttributeName, const WPXString 
sAttributeValue);
 virtual void write(OdfDocumentHandler *pHandler) const;
diff --git a/writerperfect/source/filter/FilterInternal.hxx 
b/writerperfect/source/filter/FilterInternal.hxx
index 04a0561..eb8c6e6 100644
--- a/writerperfect/source/filter/FilterInternal.hxx
+++ b/writerperfect/source/filter/FilterInternal.hxx
@@ -30,20 +30,11 @@
 #define WRITER_DEBUG_MSG(M)
 #endif
 #include libwpd/libwpd.h
-#include string.h // for strcmp
 
 const double fDefaultSideMargin = 1.0; // inches
 const double fDefaultPageWidth = 8.5f; // inches (OOo required default: we 
will handle this later)
 const double fDefaultPageHeight = 11.0; // inches
 
-struct ltstr
-{
-   bool operator()(const WPXString  s1, const WPXString  s2) const
-   {
-  return strcmp(s1.cstr(), s2.cstr())  0;
-   }
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/FontStyle.cxx 
b/writerperfect/source/filter/FontStyle.cxx
index e9a5be1..a3f0ef7 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -44,10 +44,50 @@ void FontStyle::write(OdfDocumentHandler *pHandler) const
 TagOpenElement styleOpen(style:font-face);
 styleOpen.addAttribute(style:name, getName());
 styleOpen.addAttribute(svg:font-family, msFontFamily);
-//styleOpen.addAttribute(style:font-pitch, msFontPitch);
 styleOpen.write(pHandler);
 TagCloseElement styleClose(style:font-face);
 styleClose.write(pHandler);
 }
 
+
+
+void FontStyleManager::clean()
+{
+for (std::mapWPXString, FontStyle *, ltstr::iterator iter = 
mHash.begin();
+ iter != mHash.end(); iter++) {
+delete(iter-second);
+}
+mHash.clear();
+}
+
+void FontStyleManager::writeFontsDeclaration(OdfDocumentHandler *pHandler) 
const
+{
+TagOpenElement(office:font-face-decls).write(pHandler);
+for (std::mapWPXString, FontStyle *, ltstr::const_iterator iter = 
mHash.begin();
+ iter != mHash.end(); iter++)
+{
+(iter-second)-write(pHandler);
+}
+
+TagOpenElement symbolFontOpen(style:font-face);
+symbolFontOpen.addAttribute(style:name, StarSymbol);
+symbolFontOpen.addAttribute(svg:font-family, StarSymbol);
+symbolFontOpen.addAttribute(style:font-charset, x-symbol);
+symbolFontOpen.write(pHandler);
+pHandler-endElement(style:font-face);
+
+pHandler-endElement(office:font-face-decls);
+}
+
+WPXString FontStyleManager::findOrAdd(const char

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - nlpsolver/locale

2011-10-23 Thread Andras Timar

 nlpsolver/locale/NLPSolverCommon_nb.properties   |2 +-
 nlpsolver/locale/NLPSolverStatusDialog_is.properties |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 03208fbdf808413480b8b7809d703d879bbfe803
Author: Andras Timar ati...@suse.com
Date:   Sun Oct 23 21:06:29 2011 +0200

nlpsolver translation update

diff --git a/nlpsolver/locale/NLPSolverCommon_nb.properties 
b/nlpsolver/locale/NLPSolverCommon_nb.properties
index 3b88d95..477fea9 100644
--- a/nlpsolver/locale/NLPSolverCommon_nb.properties
+++ b/nlpsolver/locale/NLPSolverCommon_nb.properties
@@ -1,6 +1,6 @@
 # x-no-translate
 #BaseNLPSolver
-NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables
+NLPSolverCommon.Properties.AssumeNonNegative=Anta positive variabler
 #BaseEvolutionarySolver
 NLPSolverCommon.Properties.SwarmSize=Size of Swarm
 NLPSolverCommon.Properties.LibrarySize=Bibliotekst\u00F8rrelse
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_is.properties 
b/nlpsolver/locale/NLPSolverStatusDialog_is.properties
index 74a8b69..f037c9a 100644
--- a/nlpsolver/locale/NLPSolverStatusDialog_is.properties
+++ b/nlpsolver/locale/NLPSolverStatusDialog_is.properties
@@ -25,4 +25,4 @@ NLPSolverStatusDialog.Time.Minutes=M\u00EDn\u00FAtur
 NLPSolverStatusDialog.Time.Hour=Klukkustund
 NLPSolverStatusDialog.Time.Hours=Klukkustundir
 NLPSolverStatusDialog.Time.Day=Dagur
-NLPSolverStatusDialog.Time.Days=Days
+NLPSolverStatusDialog.Time.Days=Dagur
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/source tools/inc tools/source

2011-10-23 Thread Ivan Timofeev

 sw/source/core/doc/doc.cxx |6 ++-
 tools/inc/tools/multisel.hxx   |   40 ++
 tools/source/memtools/multisel.cxx |   56 -
 3 files changed, 33 insertions(+), 69 deletions(-)

New commits:
commit a47a5ed0a5ffd948d48e02e5a9f0e2064096e7d4
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sun Oct 23 21:35:00 2011 +0400

always explicitly handle empty string of ranges

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 96a1629..4580328 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1584,13 +1584,15 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
 rValidPagesSet.clear();
 rValidStartFrms.clear();
 
-rtl::OUString aPageRange = rOptions.getStringValue( PageRange, 
rtl::OUString() );
+rtl::OUString aPageRange;
 // PageContent :
 // 0 - print all pages (default if aPageRange is empty)
 // 1 - print range according to PageRange
 // 2 - print selection
 const sal_Int32 nContent = rOptions.getIntValue( PrintContent, 0 );
-if (0 == nContent)
+if (nContent == 1)
+aPageRange = rOptions.getStringValue( PageRange, rtl::OUString() );
+if (aPageRange.getLength() == 0)// empty string - print all
 {
 // set page range to print to 'all pages'
 aPageRange = OUString::valueOf( (sal_Int32)1 );
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 8e4879f..47f56f2 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -191,8 +191,6 @@ public:
 - the string - means the sequence i_nMinNumber to i_nMaxNumber
 - single number that doesn't fit in [i_nMinNumber,i_nMaxNumber] will be 
ignored
 - range that doesn't fit in [i_nMinNumber,i_nMaxNumber] will be adjusted
-- an empty string as input is valid and will result in the range [min,max] 
if given
-  or an empty vector, if not
 */
 static bool getRangesFromString( const rtl::OUString i_rPageRange,
  std::vector sal_Int32  o_rPageVector,
diff --git a/tools/source/memtools/multisel.cxx 
b/tools/source/memtools/multisel.cxx
index 13275a8..68a9eac 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -831,16 +831,6 @@ bool StringRangeEnumerator::setRange( const rtl::OUString 
i_rNewRange, bool i_b
 mnCount = 0;
 maSequence.clear();
 
-// we love special cases
-if( i_rNewRange.getLength() == 0 )
-{
-if( mnMin = 0  mnMax = 0 )
-{
-insertRange( mnMin, mnMax, mnMin != mnMax, ! i_bStrict );
-}
-return true;
-}
-
 const sal_Unicode* pInput = i_rNewRange.getStr();
 rtl::OUStringBuffer aNumberBuf( 16 );
 std::vector sal_Int32  aNumbers;
commit 3d5caa7ce38c9441d05b01c6fe5ff3bd51de
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sun Oct 23 17:45:34 2011 +0400

StringRangeEnumerator cleanup

* do not allow default unbounded min and max, syntax of the input string
  requires them
* simplify logic, remove unused methods, make the class immutable, actualize
  documentation

diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index a979c23..8e4879f 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -122,7 +122,9 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator
 sal_Int32  mnMin;
 sal_Int32  mnMax;
 sal_Int32  mnOffset;
+bool   mbValidInput;
 
+bool setRange( const rtl::OUString i_rNewRange, bool i_bStrict = false );
 bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence, bool 
bMayAdjust );
 bool insertJoinedRanges( const std::vector sal_Int32  rNumbers, bool 
i_bStrict );
 bool checkValue( sal_Int32, const std::set sal_Int32 * i_pPossibleValues 
= NULL ) const;
@@ -152,10 +154,9 @@ public:
 
 friend class StringRangeEnumerator::Iterator;
 
-StringRangeEnumerator() : mnCount( 0 ), mnMin( -1 ), mnMax( -1 ), 
mnOffset( -1 ) {}
 StringRangeEnumerator( const rtl::OUString i_rInput,
-   sal_Int32 i_nMinNumber = -1,
-   sal_Int32 i_nMaxNumber = -1,
+   sal_Int32 i_nMinNumber,
+   sal_Int32 i_nMaxNumber,
sal_Int32 i_nLogicalOffset = -1
);
 
@@ -163,14 +164,7 @@ public:
 Iterator begin( const std::set sal_Int32 * i_pPossibleValues = NULL ) 
const;
 Iterator end( const std::set sal_Int32 * i_pPossibleValues = NULL ) 
const;
 
-sal_Int32 getMin() const { return mnMin; }
-void setMin( sal_Int32 i_nMinValue ) { mnMin = i_nMinValue; }
-sal_Int32 getMax() const { return mnMax; }
-void

[Libreoffice-commits] .: writerperfect/source

2011-10-23 Thread Stephan Bergmann

 writerperfect/source/filter/OdtGenerator.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit d049f12c29faa685dc79a32dc8337b91680ca7a7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Sun Oct 23 22:48:10 2011 +0200

Removed apparently unused fSectionSpaceAfter (nee 
OdtGenerator::mfSectionSpaceAfter).

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index e681a39..04e0351 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -547,16 +547,10 @@ void OdtGenerator::openSection(const WPXPropertyList 
propList, const WPXPropert
 int iNumColumns = columns.count();
 double fSectionMarginLeft = 0.0;
 double fSectionMarginRight = 0.0;
-double fSectionSpaceAfter = 0.0;
 if (propList[fo:margin-left])
 fSectionMarginLeft = propList[fo:margin-left]-getDouble();
 if (propList[fo:margin-right])
 fSectionMarginRight = propList[fo:margin-right]-getDouble();
-if (propList[fo:margin-bottom])
-  fSectionSpaceAfter = propList[fo:margin-bottom]-getDouble();
-else if (propList[libwpd:margin-bottom])
-  fSectionSpaceAfter =  propList[libwpd:margin-bottom]-getDouble();
-
 
 if (iNumColumns  1 || fSectionMarginLeft != 0 || fSectionMarginRight != 0)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc sc/source

[Libreoffice-commits] .: 3 commits - automation/Package_packimages.mk automation/Package_testtool.mk bean/Jar_officebean.mk desktop/Package_branding.mk desktop/Package_rcfile.mk filter/Configuration_f

[Libreoffice-commits] .: writerperfect/source writerperfect/StaticLibrary_writerperfect.mk

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - nlpsolver/locale

[Libreoffice-commits] .: 2 commits - sw/source tools/inc tools/source

[Libreoffice-commits] .: writerperfect/source

6 matches

Site Navigation

Mail list logo

Footer information