[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Jan Holesovsky]

 sc/source/core/data/dpsdbtab.cxx |2 +-
 sc/source/core/data/dpshttab.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d6f876434ff957ea6b5fd938fb3b779e4527c63f
Author: Jan Holesovsky 
Date:   Fri Jan 13 08:57:46 2012 +0100

Fix MinGW build.

diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 1cfa2f8..576beb5 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -140,7 +140,7 @@ void ScDatabaseDPData::CreateCacheTable()
 
 if (!aCacheTable.hasCache())
 {
-fprintf(stdout, "ScDatabaseDPData::CreateCacheTable:   NOT GOOD!\n");
+OSL_FAIL("Cache table should be created with a live data cache 
instance at all times.");
 // This better not happen!!  Cache table should be created with a live
 // data cache instance at all times.
 return;
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 14a6f7b..8832b23 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -192,7 +192,7 @@ void ScSheetDPData::CreateCacheTable()
 
 if (!aCacheTable.hasCache())
 {
-fprintf(stdout, "ScSheetDPData::CreateCacheTable:   NOT GOOD!!!\n");
+OSL_FAIL("Cache table should be created with a live data cache 
instance at all times.");
 // This better not happen!!  The cache table should be created with a
 // live data cache at all times.
 return;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 sc/source/ui/inc/anyrefdg.hxx  |   23 +++---
 sc/source/ui/miscdlgs/anyrefdg.cxx |   84 ++---
 2 files changed, 49 insertions(+), 58 deletions(-)

New commits:
commit df97997452b443f184c07c8cb1eedaaa0621f05f
Author: David Tardon 
Date:   Fri Jan 13 07:53:08 2012 +0100

refactor slightly to avoid link problems with gcc 4.7

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 3dd531b..383f6b3 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -121,7 +121,6 @@ class SC_DLLPUBLIC ScRefHandler : //public 
SfxModelessDialog,
 public:
 operator Window *(){ return &m_rWindow; }
 Window  * operator ->() { return static_cast(*this); }
-template friend class ScRefHdlrImplBase;
 friend classformula::RefButton;
 friend classformula::RefEdit;
 
@@ -152,6 +151,9 @@ protected:
 
 boolParseWithNames( ScRangeList& rRanges, const String& 
rStr, ScDocument* pDoc );
 
+void preNotify(const NotifyEvent& rEvent, const bool bBindRef);
+void stateChanged(const StateChangedType nStateChange, const bool 
bBindRef);
+
 public:
 ScRefHandler( Window &rWindow, SfxBindings* pB/*, 
SfxChildWindow* pCW,
  Window* pParent, sal_uInt16 nResId*/, 
bool bBindRef );
@@ -222,6 +224,20 @@ ScRefHdlrImplBase::ScRefHdlrImplBase( 
TParentWindow* pParent,
 template
 ScRefHdlrImplBase::~ScRefHdlrImplBase(){}
 
+template
+long ScRefHdlrImplBase::PreNotify( NotifyEvent& rNEvt )
+{
+ScRefHandler::preNotify( rNEvt, bBindRef );
+return TWindow::PreNotify( rNEvt );
+}
+
+template
+void ScRefHdlrImplBase::StateChanged( StateChangedType 
nStateChange )
+{
+TWindow::StateChanged( nStateChange );
+ScRefHandler::stateChanged( nStateChange, bBindRef );
+}
+
 //
 template
 struct ScRefHdlrImpl: ScRefHdlrImplBase
@@ -257,11 +273,6 @@ inline  bool ScRefHandler::CanInputDone( sal_Bool bForced )
 return m_aHelper.CanInputDone( bForced );
 }
 
-template <> SC_DLLPUBLIC void 
ScRefHdlrImplBase::StateChanged( StateChangedType 
nStateChange );
-template <> SC_DLLPUBLIC long 
ScRefHdlrImplBase::PreNotify( NotifyEvent& rNEvt );
-template <> SC_DLLPUBLIC void 
ScRefHdlrImplBase::StateChanged( StateChangedType 
nStateChange );
-template <> SC_DLLPUBLIC long 
ScRefHdlrImplBase::PreNotify( NotifyEvent& rNEvt );
-
 #endif // SC_ANYREFDG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 91e3858..b0a4ad6 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -865,54 +865,38 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* 
pEdit, formula::RefButton*
 m_aHelper.ToggleCollapsed( pEdit, pButton );
 }
 
-#if defined( _MSC_VER )
-#define INTRODUCE_TEMPLATE
-#else
-#define INTRODUCE_TEMPLATE  template <>
-#endif
-
-#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef )  \
-INTRODUCE_TEMPLATE long ScRefHdlrImplBase::PreNotify( 
NotifyEvent& rNEvt )\
-{\
-if( bBindRef || m_bInRefMode )\
-{\
-sal_uInt16 nSwitch=rNEvt.GetType();\
-if(nSwitch==EVENT_GETFOCUS)\
-{\
-pActiveWin=rNEvt.GetWindow();\
-}\
-}\
-return TWindow::PreNotify(rNEvt);\
-}
-
-#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef )   \
-INTRODUCE_TEMPLATE void ScRefHdlrImplBase::StateChanged( 
StateChangedType nStateChange )\
-{\
-TWindow::StateChanged( nStateChange );\
-\
-if( !bBindRef && !m_bInRefMode ) return;\
-\
-if(nStateChange == STATE_CHANGE_VISIBLE)\
-{\
-if(m_rWindow.IsVisible())\
-{\
-m_aHelper.enableInput( false );\
-m_aHelper.EnableSpreadsheets();\
-m_aHelper.SetDispatcherLock( sal_True );\
-aTimer.Start();\
-}\
-else\
-{\
-m_aHelper.enableInput( sal_True );\
-m_aHelper.SetDispatcherLock( false );   /*//! here and in 
DoClose ?*/\
-}\
-}\
-}
-
-IMPL_TWINDOW_PRENOTIFY( SfxModelessDialog, true )
-IMPL_TWINDOW_PRENOTIFY( SfxTabDialog, false )
-IMPL_TWINDOW_STATECHANGED( SfxModelessDialog, true )
-IMPL_TWINDOW_STATECHANGED( SfxTabDialog, false )
+void ScRefHandler::preNotify(const NotifyEvent& rNEvt, const bool bBindRef)
+{
+if( bBindRef || m_bInRefMode )
+{
+sal_uInt16 nSwitch=rNEvt.GetType();
+if(nSwitch==EVENT_GETFOCUS)
+{
+pActiveWin=rNEvt.GetWindow();
+}
+}
+}
+
+void ScRefHandler::stateChanged(const StateChangedType nStateChange, const 
bool bBindRef)
+{
+if( !bBindRef && !m_bInRefMode ) return;
+
+if(nStateChange == STATE_CHANGE_VISIBLE)
+{
+if(m_rWindow.IsVisible())
+{
+m_aHelper.enableInput( false );
+m_aHelper.EnableSpreadsheets();

[Libreoffice-commits] .: sc/source

[Markus Mohrhard]

 sc/source/core/data/dpsdbtab.cxx |2 +-
 sc/source/core/data/dpshttab.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 98038f308984841752449346f4f3de6d4859dc1d
Author: Markus Mohrhard 
Date:   Fri Jan 13 06:31:43 2012 +0100

change debug statements to fix build

diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 1cfa2f8..75dd964 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -140,7 +140,7 @@ void ScDatabaseDPData::CreateCacheTable()
 
 if (!aCacheTable.hasCache())
 {
-fprintf(stdout, "ScDatabaseDPData::CreateCacheTable:   NOT GOOD!\n");
+OSL_FAIL("ScDatabaseDPData::CreateCacheTable:   NOT GOOD!");
 // This better not happen!!  Cache table should be created with a live
 // data cache instance at all times.
 return;
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 60db27b..cde9a27 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -192,7 +192,7 @@ void ScSheetDPData::CreateCacheTable()
 
 if (!aCacheTable.hasCache())
 {
-fprintf(stdout, "ScSheetDPData::CreateCacheTable:   NOT GOOD!!!\n");
+OSL_FAIL("ScSheetDPData::CreateCacheTable:   NOT GOOD!!!");
 // This better not happen!!  The cache table should be created with a
 // live data cache at all times.
 return;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[August Sodora]

 sw/inc/doc.hxx |   22 +-
 sw/inc/editsh.hxx  |6 +-
 sw/source/core/doc/docfld.cxx  |   79 +
 sw/source/core/edit/edfld.cxx  |6 +-
 sw/source/ui/app/apphdl.cxx|   13 ++
 sw/source/ui/dbui/dbmgr.cxx|4 -
 sw/source/ui/dbui/mmconfigitem.cxx |6 +-
 sw/source/ui/fldui/changedb.cxx|   17 ---
 sw/source/ui/uiview/view2.cxx  |8 +--
 9 files changed, 79 insertions(+), 82 deletions(-)

New commits:
commit a8c8eae8d507bd254a476f5c4cd107793a725866
Author: August Sodora 
Date:   Fri Jan 13 00:20:39 2012 -0500

SvStringsDtor->std::vector

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e85ba27..47b55ec 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -652,16 +652,16 @@ private:
 
 // Database fields:
 void UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc );
-void AddUsedDBToList( SvStringsDtor& rDBNameList,
-  const SvStringsDtor& rUsedDBNames );
-void AddUsedDBToList( SvStringsDtor& rDBNameList, const String& rDBName );
-sal_Bool IsNameInArray( const SvStringsDtor& rOldNames, const String& 
rName );
-void GetAllDBNames( SvStringsDtor& rAllDBNames );
-void ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames,
+void AddUsedDBToList( std::vector& rDBNameList,
+  const std::vector& rUsedDBNames );
+void AddUsedDBToList( std::vector& rDBNameList, const String& 
rDBName );
+sal_Bool IsNameInArray( const std::vector& rOldNames, const 
String& rName );
+void GetAllDBNames( std::vector& rAllDBNames );
+void ReplaceUsedDBs( const std::vector& rUsedDBNames,
 const String& rNewName, String& rFormel );
-SvStringsDtor& FindUsedDBs( const SvStringsDtor& rAllDBNames,
+std::vector& FindUsedDBs( const std::vector& rAllDBNames,
 const String& rFormel,
-SvStringsDtor& rUsedDBNames );
+std::vector& rUsedDBNames );
 
 void InitDrawModel();
 void ReleaseDrawModel();
@@ -1129,13 +1129,13 @@ public:
 */
 void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { pNewDBMgr = pNewMgr; }
 SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
-void ChangeDBFields( const SvStringsDtor& rOldNames,
+void ChangeDBFields( const std::vector& rOldNames,
 const String& rNewName );
 void SetInitDBFields(sal_Bool b);
 
 // Find out which databases are used by fields.
-void GetAllUsedDB( SvStringsDtor& rDBNameList,
-   const SvStringsDtor* pAllDBNames = 0 );
+void GetAllUsedDB( std::vector& rDBNameList,
+   const std::vector* pAllDBNames = 0 );
 
 void ChgDBData( const SwDBData& rNewData );
 SwDBData GetDBData();
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 11e3376..173de37 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -346,10 +346,10 @@ public:
 SwDBData GetDBData() const;
 const SwDBData& GetDBDesc() const;
 void ChgDBData(const SwDBData& SwDBData);
-void ChangeDBFields( const SvStringsDtor& rOldNames,
+void ChangeDBFields( const std::vector& rOldNames,
  const String& rNewName );
-void GetAllUsedDB( SvStringsDtor& rDBNameList,
-SvStringsDtor* pAllDBNames = 0 );
+void GetAllUsedDB( std::vector& rDBNameList,
+   std::vector* pAllDBNames = 0 );
 
 sal_Bool IsAnyDatabaseFieldInDoc()const;
 
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 670190f..198e794 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1665,11 +1665,11 @@ String lcl_DBDataToString(const SwDBData& rData)
 return sRet;
 }
 
-void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList,
-const SvStringsDtor* pAllDBNames )
+void SwDoc::GetAllUsedDB( std::vector& rDBNameList,
+  const std::vector* pAllDBNames )
 {
-SvStringsDtor aUsedDBNames;
-SvStringsDtor aAllDBNames;
+std::vector aUsedDBNames;
+std::vector aAllDBNames;
 
 if( !pAllDBNames )
 {
@@ -1687,7 +1687,7 @@ void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList,
 String aCond( pSect->GetCondition() );
 AddUsedDBToList( rDBNameList, FindUsedDBs( *pAllDBNames,
 aCond, aUsedDBNames ) );
-aUsedDBNames.DeleteAndDestroy( 0, aUsedDBNames.Count() );
+aUsedDBNames.clear();
 }
 }
 
@@ -1727,7 +1727,7 @@ void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList,
 case RES_HIDDENPARAFLD:
 AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames,
 pFld->GetPar1(), aUsedDBNames ));
-aUsedDBNames.DeleteAndDestroy( 0, aUsedDBN

[Libreoffice-commits] .: sd/CppunitTest_sd_regression_test.mk sd/qa

[Markus Mohrhard]

 sd/CppunitTest_sd_regression_test.mk |  141 
 sd/qa/unit/regression-test.cxx   |  203 +++
 2 files changed, 344 insertions(+)

New commits:
commit 2b2fbf7350cbc53b878a7faf9ab353146fb598bf
Author: Markus Mohrhard 
Date:   Fri Jan 13 04:30:48 2012 +0100

add test concept for draw/impress, import file and export to svg

the idea behind this concept:
* have a file containing some test data
* import file without UI
* export file to svg through XStorable::storeToURL
* compare exported svg file to a reference file and complain if they
* differ

advantages:
* easy to create test cases, even for non coders
* no special handling of sd internal code needed
* svg is showing differences in the representation and not in the model
* external programs that can be used to check the output
* can be used for all input formats

disadvantages:
* changes to svg filter code might break test cases while the change is
correct
* slow test, import + export
* might need external program for xml diff

diff --git a/sd/CppunitTest_sd_regression_test.mk 
b/sd/CppunitTest_sd_regression_test.mk
new file mode 100644
index 000..85b5c6d
--- /dev/null
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -0,0 +1,141 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara 
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sd_regression_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_regression_test, \
+sd/qa/unit/regression-test2 \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sd_regression_test, \
+avmedia \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+fileacc \
+for \
+forui \
+i18nisolang1 \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sd \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+   test \
+tl \
+tk \
+ucbhelper \
+   unotest \
+utl \
+vcl \
+xo \
+   $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sd_regression_test,\
+-I$(realpath $(SRCDIR)/sd/source/ui/inc) \
+-I$(realpath $(SRCDIR)/sd/inc) \
+$$(INCLUDE) \
+-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sd_regression_test,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sd_regression_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sd_regression_test,\
+types \
+))
+
+$(eval $(call gb_CppunitTest_add_components,sd_regression_test,\
+basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+desktop/source/deployment/deployment \
+fileaccess/source/fileacc \
+filter/source/config/cache/filterconfig1 \
+filter/source/svg/svgfilter \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+sax/source/fastparser/fastsax \
+sd/util/sd \
+sd/util/sdfilt \
+sd/util/sdd \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+toolkit/util/tk \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+xmlsecurity/util/xsec_fw \
+xmlsecurity/util/xmlsecurity \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,sd_regression_test,\
+embobj \
+ucb1 \
+ucpexpand1 \
+ucpfile1 \
+ucpgio \
+ucppkg1 \
+ucptdoc1 \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sd_regression_test,\
+--headless \
+--protector unoexceptionprotector$(gb_Library_DLLEXT) 

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

[August Sodora]

 sw/inc/doc.hxx |2 +-
 sw/inc/editsh.hxx  |2 +-
 sw/source/core/doc/doc.cxx |6 +++---
 sw/source/core/edit/editsh.cxx |2 +-
 sw/source/core/unocore/unocoll.cxx |4 ++--
 sw/source/ui/fldui/flddinf.cxx |6 +++---
 sw/source/ui/fldui/flddok.cxx  |   18 +-
 sw/source/ui/fldui/fldfunc.cxx |8 
 sw/source/ui/fldui/fldmgr.cxx  |   19 +--
 sw/source/ui/fldui/fldref.cxx  |6 +++---
 sw/source/ui/fldui/fldvar.cxx  |   24 
 sw/source/ui/inc/fldmgr.hxx|3 ++-
 sw/source/ui/utlui/content.cxx |7 +++
 sw/source/ui/utlui/gloslst.cxx |   12 +---
 14 files changed, 58 insertions(+), 61 deletions(-)

New commits:
commit c1400c98ce137dddb252f9759ca9a89ab3452764
Author: August Sodora 
Date:   Thu Jan 12 23:15:09 2012 -0500

SvStringsDtor->std::vector

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 11f8cd8..e85ba27 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1704,7 +1704,7 @@ public:
 
 // Return names of all references that are set in document.
 // If array pointer is 0 return only whether a RefMark is set in document.
-sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const;
+sal_uInt16 GetRefMarks( std::vector* = 0 ) const;
 
 // Insert label. If a FlyFormat is created, return it.
 SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const String &rTxt, 
const String& rSeparator,
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 70af368..11e3376 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -741,7 +741,7 @@ public:
 
 //  Return names of all references set in document.
 //  If ArrayPointer == 0 then return only whether a RefMark is set in 
document.
-sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const;
+sal_uInt16 GetRefMarks( std::vector* = 0 ) const;
 
 // Call AutoCorrect
 void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True,
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 8be6aa7..8c61466 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1822,7 +1822,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex 
) const
 // Return the names of all set references in the Doc
 //JP 24.06.96: If the array pointer is 0, then just return whether a RefMark 
is set in the Doc
 // OS 25.06.96: From now on we always return the reference count
-sal_uInt16 SwDoc::GetRefMarks( SvStringsDtor* pNames ) const
+sal_uInt16 SwDoc::GetRefMarks( std::vector* pNames ) const
 {
 const SfxPoolItem* pItem;
 const SwTxtRefMark* pTxtRef;
@@ -1836,8 +1836,8 @@ sal_uInt16 SwDoc::GetRefMarks( SvStringsDtor* pNames ) 
const
 {
 if( pNames )
 {
-String* pTmp = new String( 
((SwFmtRefMark*)pItem)->GetRefName() );
-pNames->Insert( pTmp, nCount );
+String pTmp(((SwFmtRefMark*)pItem)->GetRefName());
+pNames->insert(pNames->begin() + nCount, pTmp);
 }
 nCount ++;
 }
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index d984598..41d113a 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -519,7 +519,7 @@ const SwFmtRefMark* SwEditShell::GetRefMark( const String& 
rName ) const
 }
 
 // returne die Namen aller im Doc gesetzten Referenzen
-sal_uInt16 SwEditShell::GetRefMarks( SvStringsDtor* pStrings ) const
+sal_uInt16 SwEditShell::GetRefMarks( std::vector* pStrings ) const
 {
 return GetDoc()->GetRefMarks( pStrings );
 }
diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index 36de7ef..4996bd3 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1948,12 +1948,12 @@ uno::Sequence< OUString > 
SwXReferenceMarks::getElementNames(void) throw( uno::R
 uno::Sequence aRet;
 if(IsValid())
 {
-SvStringsDtor aStrings;
+std::vector aStrings;
 sal_uInt16 nCount = GetDoc()->GetRefMarks( &aStrings );
 aRet.realloc(nCount);
 OUString* pNames = aRet.getArray();
 for(sal_uInt16 i = 0; i < nCount; i++)
-pNames[i] = *aStrings.GetObject(i);
+pNames[i] = aStrings[i];
 }
 else
 throw uno::RuntimeException();
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index f89b64b..7160fc2 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -139,9 +139,9 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
 nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32());
 }
 
-SvStringsDtor aLst;
+std::vector aLst;
 GetFldMgr().GetSubTypes(nTypeId, aLst);
-for (sal_uInt16 i = 0; i < aLst.Count(); ++i)
+for(size_t i = 0; i < aLst.size(); ++i)
 {
 if (!IsFldEdit() || nSubType == i)

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

[August Sodora]

 sw/source/ui/envelp/label1.cxx |   28 +++-
 sw/source/ui/envelp/labfmt.cxx |   10 --
 sw/source/ui/inc/initui.hxx|9 +
 sw/source/ui/inc/label.hxx |6 +++---
 sw/source/ui/utlui/initui.cxx  |   35 ++-
 5 files changed, 37 insertions(+), 51 deletions(-)

New commits:
commit dea42954b5e9a22f0d498cad0cc3c373ec5940e8
Author: August Sodora 
Date:   Thu Jan 12 21:28:57 2012 -0500

SvStringsDtor->std::vector

diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index dcf87de..b1bde75 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -108,10 +108,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
 SfxTabDialog( pParent, SW_RES(DLG_LAB), &rSet, sal_False ),
 pNewDBMgr(pDBMgr),
 pPrtPage(0),
-
 aTypeIds( 50, 10 ),
-aMakes  (  5,  0 ),
-
 pRecs   ( new SwLabRecs() ),
 sBusinessCardDlg(SW_RES(ST_BUSINESSCARDDLG)),
 sFormat(SW_RES(ST_FIRSTPAGE_LAB)),
@@ -171,13 +168,13 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& 
rSet,
 const rtl::OUString* pMan = rMan.getConstArray();
 for(sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++)
 {
-aMakes.Insert( new String(pMan[nMan]), aMakes.Count() );
+aMakes.push_back(pMan[nMan]);
 if ( pMan[nMan] == aItem.aLstMake )
 nLstGroup = (sal_uInt16) nMan;
 }
 
-if ( aMakes.Count() )
-_ReplaceGroup( *aMakes[nLstGroup] );
+if ( !aMakes.empty() )
+_ReplaceGroup( aMakes[nLstGroup] );
 
 if (pExampleSet)
 pExampleSet->Put(aItem);
@@ -284,15 +281,15 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& 
rSet) :
 
 InitDatabaseBox();
 
-sal_uInt16 nLstGroup = 0;
+size_t nLstGroup = 0;
 
-const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().Count();
-for (sal_uInt16 i = 0; i < nCount; ++i)
+const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().size();
+for(size_t i = 0; i < nCount; ++i)
 {
-String &rStr = *GetParent()->Makes()[i];
+rtl::OUString& rStr = GetParent()->Makes()[i];
 aMakeBox.InsertEntry( rStr );
 
-if ( rStr == String(aItem.aLstMake) )
+if ( rStr == aItem.aLstMake)
 nLstGroup = i;
 }
 
@@ -578,15 +575,12 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
 aAddrBox.Check  ( aItem.bAddr );
 aWritingEdit.SetText( aWriting.ConvertLineEnd() );
 
-const sal_uInt16 nCount = (sal_uInt16)GetParent()->Makes().Count();
-for (sal_uInt16 i = 0; i < nCount; ++i)
+for(std::vector::const_iterator i = 
GetParent()->Makes().begin(); i != GetParent()->Makes().end(); ++i)
 {
-String &rStr = *GetParent()->Makes()[i];
-if(aMakeBox.GetEntryPos(String(rStr)) == LISTBOX_ENTRY_NOTFOUND)
-aMakeBox.InsertEntry( rStr );
+if(aMakeBox.GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND)
+aMakeBox.InsertEntry(*i);
 }
 
-
 aMakeBox.SelectEntry( aItem.aMake );
 //save the current type
 String sType(aItem.aType);
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index aac84d8..2aa1e3b 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -552,15 +552,13 @@ IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG )
 {
 bModified = sal_False;
 const Sequence& rMan = 
GetParent()->GetLabelsConfig().GetManufacturers();
-SvStringsDtor& rMakes = GetParent()->Makes();
-if(rMakes.Count() < (sal_uInt16)rMan.getLength())
+std::vector& rMakes(GetParent()->Makes());
+if(rMakes.size() < (sal_uInt16)rMan.getLength())
 {
-rMakes.DeleteAndDestroy(0, rMakes.Count());
+rMakes.clear();
 const OUString* pMan = rMan.getConstArray();
 for(sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++)
-{
-rMakes.Insert( new String(pMan[nMan]), rMakes.Count() );
-}
+rMakes.push_back(pMan[nMan]);
 }
 aMakeFI.SetText(aItem.aMake);
 aTypeFI.SetText(aItem.aType);
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx
index 1824e49..8d8780a 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/ui/inc/label.hxx
@@ -48,7 +48,7 @@ class SwLabDlg : public SfxTabDialog
 SwLabPrtPage*   pPrtPage;
 
 std::vector aTypeIds;
-SvStringsDtor   aMakes;
+std::vector aMakes;
 
 SwLabRecs*  pRecs;
 String  aLstGroup;
@@ -74,8 +74,8 @@ public:
   std::vector &TypeIds()   { return aTypeIds; }
 const std::vector &TypeIds() const { return aTypeIds; }
 
-  SvStringsDtor  &Makes() { return aMakes;   }
-const SvStringsDtor  &Makes()   const { return aMakes;   }
+std::vector &Makes() { return aMakes; }
+const std::vector &Makes() const { return aMakes; }
 

[Libreoffice-commits] .: sc/qa

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 05fa6914d38abea3c29ab360c62d2f153896798a
Author: Kohei Yoshida 
Date:   Thu Jan 12 22:06:45 2012 -0500

Removing debug statement.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ad412ef..1afe05f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -724,7 +724,6 @@ void testFuncCELL(ScDocument* pDoc)
 for (size_t i = 0; i < SAL_N_ELEMENTS(aChecks); ++i)
 {
 rtl::OUString aVal = pDoc->GetString(0, i, 0);
-cout << "CELL: " << aVal << endl;
 CPPUNIT_ASSERT_MESSAGE("Unexpected result for CELL", 
aVal.equalsAscii(aChecks[i].pRes));
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/qa

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4afe80425994cc9933649ed556e5fa6bdff59885
Author: Kohei Yoshida 
Date:   Thu Jan 12 22:06:45 2012 -0500

Removing debug statement.

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9b86275..23449b9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -724,7 +724,6 @@ void testFuncCELL(ScDocument* pDoc)
 for (size_t i = 0; i < SAL_N_ELEMENTS(aChecks); ++i)
 {
 rtl::OUString aVal = pDoc->GetString(0, i, 0);
-cout << "CELL: " << aVal << endl;
 CPPUNIT_ASSERT_MESSAGE("Unexpected result for CELL", 
aVal.equalsAscii(aChecks[i].pRes));
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/dpcachetable.hxx  |1 
 sc/inc/dpobject.hxx  |   25 ++
 sc/inc/dpsdbtab.hxx  |5 
 sc/inc/dptablecache.hxx  |   10 +
 sc/qa/unit/ucalc.cxx |   43 +++-
 sc/source/core/data/documen2.cxx |6 
 sc/source/core/data/dpcachetable.cxx |   10 -
 sc/source/core/data/dpobject.cxx |  311 ---
 sc/source/core/data/dpsdbtab.cxx |   15 -
 sc/source/core/data/dpshttab.cxx |7 
 sc/source/core/data/dptablecache.cxx |   18 ++
 sc/source/ui/unoobj/dapiuno.cxx  |   10 -
 sc/source/ui/view/dbfunc3.cxx|   11 +
 13 files changed, 381 insertions(+), 91 deletions(-)

New commits:
commit 44cd9971649b9611c59bb3e423133b9a4d82a2fa
Author: Kohei Yoshida 
Date:   Thu Jan 12 21:49:24 2012 -0500

Test the new logic of our pivot data cache life cycle.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 685f7d2..47c1999 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -271,6 +271,7 @@ public:
 SheetCaches(ScDocument* pDoc);
 bool hasCache(const ScRange& rRange) const;
 const ScDPCache* getCache(const ScRange& rRange);
+size_t size() const;
 
 void updateReference(
 UpdateRefMode eMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, 
SCsTAB nDz);
@@ -294,6 +295,7 @@ public:
 NameCaches(ScDocument* pDoc);
 bool hasCache(const rtl::OUString& rName) const;
 const ScDPCache* getCache(const ::rtl::OUString& rName, const ScRange& 
rRange);
+size_t size() const;
 private:
 void updateCache(const rtl::OUString& rName, const ScRange& rRange, 
std::set& rRefs);
 void removeCache(const ::rtl::OUString& rName);
@@ -329,6 +331,8 @@ public:
 public:
 DBCaches(ScDocument* pDoc);
 const ScDPCache* getCache(sal_Int32 nSdbType, const ::rtl::OUString& 
rDBName, const ::rtl::OUString& rCommand);
+size_t size() const;
+
 private:
 com::sun::star::uno::Reference 
createRowSet(
 sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const 
::rtl::OUString& rCommand);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 88abad3..ad412ef 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1323,6 +1323,7 @@ void Test::testDataPilot()
 bSuccess = checkDPTableOutput<5>(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
+CPPUNIT_ASSERT_MESSAGE("There should be only one data cache.", 
pDPs->GetSheetCaches().size() == 1);
 
 // Update the cell values.
 double aData2[] = { 100, 200, 300, 400, 500, 600 };
@@ -1361,15 +1362,22 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
+CPPUNIT_ASSERT_MESSAGE("There should be only one data cache.", 
pDPs->GetSheetCaches().size() == 1);
+
 // Free the first datapilot object after the 2nd one gets reloaded, to
 // prevent the data cache from being deleted before the reload.
 pDPs->FreeTable(pDPObj);
 
+CPPUNIT_ASSERT_MESSAGE("There should be only one data cache.", 
pDPs->GetSheetCaches().size() == 1);
+
 // This time clear the cache to refresh the data from the source range.
 CPPUNIT_ASSERT_MESSAGE("This datapilot should be based on sheet data.", 
pDPObj2->IsSheetData());
 std::set aRefs;
 sal_uLong nErrId = pDPs->ReloadCache(pDPObj2, aRefs);
-CPPUNIT_ASSERT_MESSAGE("Cache removal failed.", nErrId == 0);
+CPPUNIT_ASSERT_MESSAGE("Cache reload failed.", nErrId == 0);
+CPPUNIT_ASSERT_MESSAGE("Reloading a cache shouldn't remove any cache.",
+   pDPs->GetSheetCaches().size() == 1);
+
 pDPObj2->ClearSource();
 pDPObj2->Output(aOutRange.aStart);
 
@@ -1395,6 +1403,8 @@ void Test::testDataPilot()
 
 // Swap the two sheets.
 m_pDoc->MoveTab(1, 0);
+CPPUNIT_ASSERT_MESSAGE("Swapping the sheets shouldn't remove the cache.",
+   pDPs->GetSheetCaches().size() == 1);
 CPPUNIT_ASSERT_MESSAGE("Cache should have moved.", 
!pDPs->GetSheetCaches().hasCache(aSrcRange));
 aSrcRange.aStart.SetTab(1);
 aSrcRange.aEnd.SetTab(1);
@@ -1404,6 +1414,9 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE("There shouldn't be any data pilot table stored 
with the document.",
pDPs->GetCount() == 0);
 
+CPPUNIT_ASSERT_MESSAGE("There shouldn't be any more data cache.",
+   pDPs->GetSheetCaches().size() == 0);
+
 m_pDoc->DeleteTab(1);
 m_pDoc->DeleteTab(0);
 }
@@ -1673,6 +1686,9 @@ void Test::testDataPilotNamedSource()
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
+CPPUNIT_ASSERT_MESSAGE("There should be one named range data cache.",
+   pDPs->GetNameCaches().size() == 1 && 
pDPs->GetSheetCaches().size() ==

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 5 commits - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/dpcachetable.hxx  |1 
 sc/inc/dpobject.hxx  |   25 ++
 sc/inc/dpsdbtab.hxx  |5 
 sc/inc/dptablecache.hxx  |   10 +
 sc/qa/unit/ucalc.cxx |   43 +++-
 sc/source/core/data/documen2.cxx |6 
 sc/source/core/data/dpcachetable.cxx |   10 -
 sc/source/core/data/dpobject.cxx |  311 ---
 sc/source/core/data/dpsdbtab.cxx |   15 -
 sc/source/core/data/dpshttab.cxx |7 
 sc/source/core/data/dptablecache.cxx |   18 ++
 sc/source/ui/unoobj/dapiuno.cxx  |   10 -
 sc/source/ui/view/dbfunc3.cxx|   11 +
 13 files changed, 381 insertions(+), 91 deletions(-)

New commits:
commit 6d7fcd016e661c07b664b6c9b454c42c02537f10
Author: Kohei Yoshida 
Date:   Thu Jan 12 21:49:24 2012 -0500

Test the new logic of our pivot data cache life cycle.

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 685f7d2..47c1999 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -271,6 +271,7 @@ public:
 SheetCaches(ScDocument* pDoc);
 bool hasCache(const ScRange& rRange) const;
 const ScDPCache* getCache(const ScRange& rRange);
+size_t size() const;
 
 void updateReference(
 UpdateRefMode eMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, 
SCsTAB nDz);
@@ -294,6 +295,7 @@ public:
 NameCaches(ScDocument* pDoc);
 bool hasCache(const rtl::OUString& rName) const;
 const ScDPCache* getCache(const ::rtl::OUString& rName, const ScRange& 
rRange);
+size_t size() const;
 private:
 void updateCache(const rtl::OUString& rName, const ScRange& rRange, 
std::set& rRefs);
 void removeCache(const ::rtl::OUString& rName);
@@ -329,6 +331,8 @@ public:
 public:
 DBCaches(ScDocument* pDoc);
 const ScDPCache* getCache(sal_Int32 nSdbType, const ::rtl::OUString& 
rDBName, const ::rtl::OUString& rCommand);
+size_t size() const;
+
 private:
 com::sun::star::uno::Reference 
createRowSet(
 sal_Int32 nSdbType, const ::rtl::OUString& rDBName, const 
::rtl::OUString& rCommand);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d2ebcc2..9b86275 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1323,6 +1323,7 @@ void Test::testDataPilot()
 bSuccess = checkDPTableOutput<5>(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
+CPPUNIT_ASSERT_MESSAGE("There should be only one data cache.", 
pDPs->GetSheetCaches().size() == 1);
 
 // Update the cell values.
 double aData2[] = { 100, 200, 300, 400, 500, 600 };
@@ -1361,15 +1362,22 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
+CPPUNIT_ASSERT_MESSAGE("There should be only one data cache.", 
pDPs->GetSheetCaches().size() == 1);
+
 // Free the first datapilot object after the 2nd one gets reloaded, to
 // prevent the data cache from being deleted before the reload.
 pDPs->FreeTable(pDPObj);
 
+CPPUNIT_ASSERT_MESSAGE("There should be only one data cache.", 
pDPs->GetSheetCaches().size() == 1);
+
 // This time clear the cache to refresh the data from the source range.
 CPPUNIT_ASSERT_MESSAGE("This datapilot should be based on sheet data.", 
pDPObj2->IsSheetData());
 std::set aRefs;
 sal_uLong nErrId = pDPs->ReloadCache(pDPObj2, aRefs);
-CPPUNIT_ASSERT_MESSAGE("Cache removal failed.", nErrId == 0);
+CPPUNIT_ASSERT_MESSAGE("Cache reload failed.", nErrId == 0);
+CPPUNIT_ASSERT_MESSAGE("Reloading a cache shouldn't remove any cache.",
+   pDPs->GetSheetCaches().size() == 1);
+
 pDPObj2->ClearSource();
 pDPObj2->Output(aOutRange.aStart);
 
@@ -1395,6 +1403,8 @@ void Test::testDataPilot()
 
 // Swap the two sheets.
 m_pDoc->MoveTab(1, 0);
+CPPUNIT_ASSERT_MESSAGE("Swapping the sheets shouldn't remove the cache.",
+   pDPs->GetSheetCaches().size() == 1);
 CPPUNIT_ASSERT_MESSAGE("Cache should have moved.", 
!pDPs->GetSheetCaches().hasCache(aSrcRange));
 aSrcRange.aStart.SetTab(1);
 aSrcRange.aEnd.SetTab(1);
@@ -1404,6 +1414,9 @@ void Test::testDataPilot()
 CPPUNIT_ASSERT_MESSAGE("There shouldn't be any data pilot table stored 
with the document.",
pDPs->GetCount() == 0);
 
+CPPUNIT_ASSERT_MESSAGE("There shouldn't be any more data cache.",
+   pDPs->GetSheetCaches().size() == 0);
+
 m_pDoc->DeleteTab(1);
 m_pDoc->DeleteTab(0);
 }
@@ -1673,6 +1686,9 @@ void Test::testDataPilotNamedSource()
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
+CPPUNIT_ASSERT_MESSAGE("There should be one named range data cache.",
+   pDPs->GetNameCaches().size() == 1 && 
pDPs->GetSheetCaches().size() ==

[Libreoffice-commits] .: sc/source

[Lior Kaplan]

 sc/source/ui/dbgui/pivot.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c4c945f00f028a39bc3534f4f707bade677983b
Author: Lior Kaplan 
Date:   Fri Jan 13 02:00:16 2012 +0200

Don't mention fields location, as they vary between LTR and RTL interfaces

diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src
index 423ea67..f7e7c3e 100644
--- a/sc/source/ui/dbgui/pivot.src
+++ b/sc/source/ui/dbgui/pivot.src
@@ -106,7 +106,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
 Pos = MAP_APPFONT ( 6 , 200 ) ;
 Size = MAP_APPFONT ( 182 , 16 ) ;
 WordBreak = TRUE ;
-Text [ en-US ] = "Drag the fields from the right into the desired 
position." ;
+Text [ en-US ] = "Drag the fields into the desired position." ;
 };
 FixedLine FL_LAYOUT
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - android/qa fontconfig/fontconfig-2.8.0.patch

[Tor Lillqvist]

 android/qa/sc/Makefile|   16 +++-
 android/qa/sc/fonts.conf  |8 ++--
 fontconfig/fontconfig-2.8.0.patch |2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 81301aae9699472bd4e491755c8ee76920711b01
Author: Tor Lillqvist 
Date:   Fri Jan 13 01:27:37 2012 +0200

More workarounds for weird problem with vnd.sun.star.expand

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 738d101..1b9ac87 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -133,20 +133,23 @@ copy-stuff:
mkdir -p assets/bin assets/lib assets/xml/ure
cp $(OUTDIR)/bin/udkapi.rdb assets/bin
cp $(OUTDIR)/bin/types.rdb assets/bin
-   cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
 # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it 
expands to empty!?
 # So just hardcode the known APP_DATA_PATH for now...
+# Ditto for URE_INTERNAL_LIB_DIR
+   for F in xml/ure/services; do \
+   sed -e 
's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g'
 <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
+   done
for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx 
unoxml/source/service/unoxml configmgr/source/configmgr; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
-   sed -e 
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!' 
<$(WORKDIR)/ComponentTarget/$$F.component 
>assets/ComponentTarget/$$F.component; \
+   sed -e 
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' 
<$(WORKDIR)/ComponentTarget/$$F.component 
>assets/ComponentTarget/$$F.component; \
done
for F in ucb1 ucpfile1; do \
-   sed -e 
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!' 
<$(OUTDIR)/xml/$$F.component > assets/xml/$$F.component; \
+   sed -e 
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' 
<$(OUTDIR)/xml/$$F.component >assets/xml/$$F.component; \
done
-   cp -R $(OUTDIR)/xml/registry assets/xml
for F in uno_services uno_types; do \
sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' 
<$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \
done
+   cp -R $(OUTDIR)/xml/registry assets/xml
 # Then assets that are unpacked at run-time into the app's data directory.
mkdir -p assets/unpack/bin
for F in $(OUTDIR)/bin/*.res; do \
commit f7392b334aa95e0896c9dd88bd74c92bc7e8b183
Author: Tor Lillqvist 
Date:   Fri Jan 13 00:41:12 2012 +0200

Fontconfig must have a cachedir, so hardcode one for now

diff --git a/android/qa/sc/fonts.conf b/android/qa/sc/fonts.conf
index 73e8a35..0eb05a2 100644
--- a/android/qa/sc/fonts.conf
+++ b/android/qa/sc/fonts.conf
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -50,7 +50,11 @@
 
 
 
-
+   
+   /data/data/org.libreoffice.android.qa.sc/fontconfig
 

 

[Libreoffice-commits] .: stoc/source

[Olivier Hallot]

 stoc/source/simpleregistry/textualservices.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba713b5add1dfbcd17f8e6c14561dd3589a3db72
Author: Olivier Hallot 
Date:   Thu Jan 12 19:33:28 2012 -0200

Fix mistake in type OUStringBuffer

Fix mistake in method for type OUStringBuffer

diff --git a/stoc/source/simpleregistry/textualservices.cxx 
b/stoc/source/simpleregistry/textualservices.cxx
index 611d0ea..37540c8 100644
--- a/stoc/source/simpleregistry/textualservices.cxx
+++ b/stoc/source/simpleregistry/textualservices.cxx
@@ -422,7 +422,7 @@ rtl::OUString pathToString(std::vector< rtl::OUString > 
const & path) {
 buf.append(sal_Unicode('/'));
 buf.append(*i);
 }
-if (buf.isEmpty()) {
+if (buf.getLength() == 0) {
 buf.append(sal_Unicode('/'));
 }
 return buf.makeStringAndClear();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: stoc/source

[Olivier Hallot]

 stoc/source/defaultregistry/defaultregistry.cxx   |   18 +++---
 stoc/source/implementationregistration/implreg.cxx|   16 +++---
 stoc/source/invocation/invocation.cxx |4 -
 stoc/source/javavm/javavm.cxx |   20 
+++
 stoc/source/loader/dllcomponentloader.cxx |2 
 stoc/source/proxy_factory/proxyfac.cxx|2 
 stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx  |2 
 stoc/source/registry_tdprovider/tdcomp.cxx|2 
 stoc/source/registry_tdprovider/tdef.cxx  |2 
 stoc/source/registry_tdprovider/tdiface.cxx   |4 -
 stoc/source/registry_tdprovider/tdservice.cxx |4 -
 stoc/source/security/access_controller.cxx|   10 +--
 stoc/source/security/file_policy.cxx  |   10 +--
 stoc/source/security/permissions.cxx  |4 -
 stoc/source/servicemanager/servicemanager.cxx |4 -
 stoc/source/simpleregistry/simpleregistry.cxx |2 
 stoc/source/simpleregistry/textualservices.cxx|   26 
+-
 stoc/source/tdmanager/tdmgr.cxx   |2 
 stoc/source/tdmanager/tdmgr_check.cxx |2 
 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx|4 -
 stoc/source/uriproc/UriReference.cxx  |   16 +++---
 stoc/source/uriproc/UriReferenceFactory.cxx   |   23 

 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx |7 --
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |8 +--
 24 files changed, 95 insertions(+), 99 deletions(-)

New commits:
commit 71dc235aba9597c3485a791a319a34e4258138db
Author: Olivier Hallot 
Date:   Thu Jan 12 17:01:19 2012 -0200

Fix for fdo43460 Part XXXV getLength() to isEmpty()

Part XXXV
Modules
stoc

diff --git a/stoc/source/defaultregistry/defaultregistry.cxx 
b/stoc/source/defaultregistry/defaultregistry.cxx
index b80167a..da291d2 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -276,7 +276,7 @@ OUString NestedKeyImpl::computeName(const OUString& name)
 return m_defaultKey->getResolvedName(name);
 }
 
-if ( resLocalName.getLength() > 0 && 
m_pRegistry->m_defaultReg->isValid() )
+if ( !resLocalName.isEmpty() && m_pRegistry->m_defaultReg->isValid() )
 {
 Reference 
localRoot(m_pRegistry->m_localReg->getRootKey());
 Reference 
defaultRoot(m_pRegistry->m_defaultReg->getRootKey());
@@ -289,7 +289,7 @@ OUString NestedKeyImpl::computeName(const OUString& name)
 {
 count--;
 
-if (resLocalName.getLength() == 0 || 
resDefaultName.getLength() == 0)
+if (resLocalName.isEmpty() || resDefaultName.isEmpty())
 throw InvalidRegistryException();
 
 resLocalName = localRoot->getResolvedName(resDefaultName);
@@ -683,7 +683,7 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( 
const OUString& aKeyN
 
 OUString resolvedName = computeName(aKeyName);
 
-if ( resolvedName.getLength() == 0 )
+if ( resolvedName.isEmpty() )
 throw InvalidRegistryException();
 
 Reference localKey, defaultKey;
@@ -719,7 +719,7 @@ Reference< XRegistryKey > SAL_CALL 
NestedKeyImpl::createKey( const OUString& aKe
 
 OUString resolvedName = computeName(aKeyName);
 
-if ( resolvedName.getLength() == 0 )
+if ( resolvedName.isEmpty() )
 throw InvalidRegistryException();
 
 if ( m_localKey.is() && m_localKey->isValid() )
@@ -788,7 +788,7 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString& 
rKeyName )
 {
 OUString resolvedName = computeName(rKeyName);
 
-if ( resolvedName.getLength() == 0 )
+if ( resolvedName.isEmpty() )
 {
 throw InvalidRegistryException();
 }
@@ -969,7 +969,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const 
OUString& aLinkName, const OU
 
 resolvedName = computeName(linkName);
 
-if ( resolvedName.getLength() == 0 )
+if ( resolvedName.isEmpty() )
 {
 throw InvalidRegistryException();
 }
@@ -1023,7 +1023,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& 
rLinkName )
 
 resolvedName = computeName(linkName);
 
-if ( resolvedName.getLength() == 0 )
+if ( resolvedName.isEmpty() )
 {
 throw InvalidRegistryException();
 }
@@ -1067,7 +1067,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const 
OUString& rLinkName )
 
 resolvedName = computeName(linkName);
 
-  

[Libreoffice-commits] .: boost/boost.6397.warnings.patch boost/makefile.mk

[Caolán McNamara]

 boost/boost.6397.warnings.patch |  222 
 boost/makefile.mk   |4 
 2 files changed, 226 insertions(+)

New commits:
commit 14359c82eb91b69212cbf0f743e819776a8f6d3a
Author: Caolán McNamara 
Date:   Thu Jan 12 20:40:36 2012 +

enable boost::multi_array

diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
new file mode 100644
index 000..a307c31
--- /dev/null
+++ b/boost/boost.6397.warnings.patch
@@ -0,0 +1,222 @@
+--- misc/boost_1_44_0/boost/multi_array/collection_concept.hpp 2012-01-12 
20:21:29.790009198 +
 misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp   
2012-01-12 20:28:55.457287835 +
+@@ -43,11 +43,11 @@
+   i = c.end();
+   c.swap(c);
+ }
+-void const_constraints(const Collection& c) {
+-  ci = c.begin();
+-  ci = c.end();
+-  n = c.size();
+-  b = c.empty();
++void const_constraints(const Collection& c_) {
++  ci = c_.begin();
++  ci = c_.end();
++  n = c_.size();
++  b = c_.empty();
+ }
+ Collection c;
+ bool b;
+--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp 2012-01-12 
20:21:29.790009198 +
 misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp   
2012-01-12 20:29:56.482879277 +
+@@ -39,8 +39,8 @@
+ 
+ template 
+ static void call(Array& a, const IdxGen& idgen, Call_Type c) {
+-  typedef typename Array::index_range index_range;
+-  typedef typename Array::index index;
++  typedef typename Array::index_range index_range_;
++  typedef typename Array::index index_;
+   idgen_helper::call(a,idgen[c],c);
+ }
+   };
+@@ -50,8 +50,8 @@
+ 
+ template 
+ static void call(Array& a, const IdxGen& idgen, Call_Type) {
+-  typedef typename Array::index_range index_range;
+-  typedef typename Array::index index;
++  typedef typename Array::index_range index_range_;
++  typedef typename Array::index index_;
+   a[ idgen ];
+ }
+   };
+@@ -153,27 +153,27 @@
+   const_constraints(a);
+ }
+ 
+-void const_constraints(const Array& a) {
++void const_constraints(const Array& a_) {
+ 
+   //  value_type vt = a[ id ];
+ 
+   // Test slicing, keeping only the first dimension, losing the rest
+-  idgen_helper::call(a,idgen[range],id);
++  idgen_helper::call(a_,idgen[range],id);
+ 
+   // Test slicing, keeping all dimensions.
+-  idgen_helper::call(a,idgen[range],range);
++  idgen_helper::call(a_,idgen[range],range);
+ 
+-  st = a.size();
+-  st = a.num_dimensions();
+-  st = a.num_elements();
+-  stp = a.shape();
+-  idp = a.strides();
+-  idp = a.index_bases();
+-  cit = a.begin();
+-  cit = a.end();
+-  crit = a.rbegin();
+-  crit = a.rend();
+-  eltp = a.origin();
++  st = a_.size();
++  st = a_.num_dimensions();
++  st = a_.num_elements();
++  stp = a_.shape();
++  idp = a_.strides();
++  idp = a_.index_bases();
++  cit = a_.begin();
++  cit = a_.end();
++  crit = a_.rbegin();
++  crit = a_.rend();
++  eltp = a_.origin();
+ }
+ 
+ typedef typename Array::value_type value_type;
+--- misc/boost_1_44_0/boost/multi_array/extent_range.hpp   2012-01-12 
20:21:29.790009198 +
 misc/build/boost_1_44_0/boost/multi_array/extent_range.hpp 2012-01-12 
20:32:16.696241748 +
+@@ -26,11 +26,11 @@
+   typedef Extent index;
+   typedef SizeType size_type;
+ 
+-  extent_range(index start, index finish) :
+-super_type(start,finish) { }
++  extent_range(index start_, index finish_) :
++super_type(start_,finish_) { }
+ 
+-  extent_range(index finish) :
+-super_type(0,finish) { }
++  extent_range(index finish_) :
++super_type(0,finish_) { }
+ 
+   extent_range() : super_type(0,0) { }
+ 
+--- misc/boost_1_44_0/boost/multi_array/index_range.hpp2012-01-12 
20:21:29.790009198 +
 misc/build/boost_1_44_0/boost/multi_array/index_range.hpp  2012-01-12 
20:31:29.405781105 +
+@@ -60,8 +60,8 @@
+   degenerate_ = true;
+ }
+ 
+-explicit index_range(index start, index finish, index stride=1)
+-  : start_(start), finish_(finish), stride_(stride),
++explicit index_range(index i_start, index i_finish, index i_stride=1)
++  : start_(i_start), finish_(i_finish), stride_(i_stride),
+ degenerate_(false)
+ { }
+ 
+@@ -107,11 +107,11 @@
+ 
+ index stride() const { return stride_; }
+ 
+-void set_index_range(index start, index finish, index stride=1)
++void set_index_range(index i_start, index i_finish, index i_stride=1)
+ {
+-  start_ = start;
+-  finish_ = finish;
+-  stride_ = stride;
++  start_ = i_start;
++  finish_ = i_finish;
++  stride_ = i_stride;
+ }
+ 
+ static index_range all() 
+--- misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp2012-01-12 
20:21:29.790009198 +
 misc/build/

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source

[Ivan Timofeev]

 cui/source/customize/eventdlg.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdc4f5c2c235ce5e7f501986d6593ef9dab47d33
Author: Ivan Timofeev 
Date:   Thu Jan 12 18:08:11 2012 +0400

move overlapped controls

diff --git a/cui/source/customize/eventdlg.src 
b/cui/source/customize/eventdlg.src
index c4ef082..4159a2d 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -65,7 +65,7 @@ TabPage RID_SVXPAGE_EVENTS
 {
 HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 54 , 238 ) ;
+Pos = MAP_APPFONT ( 62 , 238 ) ;
 Size = MAP_APPFONT ( 132 , 53 ) ;
 DropDown = TRUE ;
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Ivan Timofeev]

 cui/source/customize/eventdlg.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b90940233f34d6cb468a2b4b8a38a78973e1d579
Author: Ivan Timofeev 
Date:   Thu Jan 12 18:08:11 2012 +0400

move overlapped controls

diff --git a/cui/source/customize/eventdlg.src 
b/cui/source/customize/eventdlg.src
index c4ef082..4159a2d 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -65,7 +65,7 @@ TabPage RID_SVXPAGE_EVENTS
 {
 HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 54 , 238 ) ;
+Pos = MAP_APPFONT ( 62 , 238 ) ;
 Size = MAP_APPFONT ( 132 , 53 ) ;
 DropDown = TRUE ;
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Repository.mk

[Matus Kukan]

 Repository.mk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 68b08a11babb7274048ef836a078959d126c97b7
Author: Matúš Kukan 
Date:   Thu Jan 12 18:33:33 2012 +0100

ops, also adapt registering of the executable

diff --git a/Repository.mk b/Repository.mk
index 38a52d5..ac24a61 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -101,9 +101,15 @@ endif
 
 endif
 
-ifneq ($(WITH_MOZILLA),NO)
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Helper_register_executables,OOO,\
+nsplugin \
+))
+
+endif
+
+ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\
-   nsplugin \
 pluginapp.bin \
 ))
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk

[Matus Kukan]

 extensions/Module_extensions.mk |   23 +++
 np_sdk/Module_np_sdk.mk |5 -
 2 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 830a2b923528323e0f39259234dfee26d9d44d21
Author: Matúš Kukan 
Date:   Thu Jan 12 09:08:13 2012 +0100

use ENABLE_NSPLUGIN again

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 9719f2b..a94eee6 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -76,36 +76,27 @@ endif # DISABLE_ATL
 
 endif # WNT
 
-ifneq ($(WITH_MOZILLA),NO)
-
+ifeq ($(ENABLE_NSPLUGIN),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-   Library_pl \
Executable_nsplugin \
+   Library_npsoplugin \
+   WinResTarget_npsoplugin \
 ))
 
-ifeq ($(GUI),WNT)
+endif
+
+ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,extensions,\
-   Library_npsoplugin \
-   WinResTarget_npsoplugin \
+   Library_pl \
 ))
-endif # GUI=WNT
 
 ifeq ($(GUI),UNX)
-
 ifneq ($(GUIBASE),aqua)
-
 $(eval $(call gb_Module_add_targets,extensions,\
Executable_pluginapp.bin \
 ))
 
 endif # GUIBASE!=aqua
-
-ifneq ($(ENABLE_GTK),)
-$(eval $(call gb_Module_add_targets,extensions,\
-   Library_npsoplugin \
-))
-endif # ENABLE_GTK
-
 endif # GUI=UNX
 
 endif # WITH_MOZILLA=YES
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index bda8126..6c658d2 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,9 +27,12 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
-ifeq ($(WITH_MOZILLA),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \
+))
+
+ifeq ($(ENABLE_NSPLUGIN),YES)
+$(eval $(call gb_Module_add_targets,np_sdk,\
StaticLibrary_nputils \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   14 --
 writerfilter/source/rtftok/rtftokenizer.cxx|4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 375de2b8bcd591d013c3411ead2e24dc23a8115e
Author: Miklos Vajna 
Date:   Wed Jan 11 00:15:51 2012 -0500

fdo#41034 improve RTF import of table cell spacings

1) for empty cells, not only paragraph properties, but but character 
properties should be emitted as well (e.g. font)
2) \sb and \sb is an attribute, not an sprm (it was ignored)
3) \sl was ~ignored due to a typo
(cherry picked from commit 9f15592e08f17908b1e54fed200d0ec6aff29509)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3dd41c0..82b2a31 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1351,9 +1351,11 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 {
 if (m_bNeedPap)
 {
-// There were no runs in the cell, so we need to send 
paragraph properties here.
-RTFValue::Pointer_t pValue(new 
RTFValue(m_aStates.top().aParagraphAttributes, 
m_aStates.top().aParagraphSprms));
-m_aTableBuffer.push_back(make_pair(BUFFER_PROPS, pValue));
+// There were no runs in the cell, so we need to send 
paragraph and character properties here.
+RTFValue::Pointer_t pPValue(new 
RTFValue(m_aStates.top().aParagraphAttributes, 
m_aStates.top().aParagraphSprms));
+m_aTableBuffer.push_back(make_pair(BUFFER_PROPS, pPValue));
+RTFValue::Pointer_t pCValue(new 
RTFValue(m_aStates.top().aCharacterAttributes, 
m_aStates.top().aCharacterSprms));
+m_aTableBuffer.push_back(make_pair(BUFFER_PROPS, pCValue));
 }
 
 RTFValue::Pointer_t pValue;
@@ -1955,8 +1957,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_LIN: nSprm = 0x845e; break;
 case RTF_RI: nSprm = NS_sprm::LN_PDxaRight; break;
 case RTF_RIN: nSprm = 0x845d; break;
-case RTF_SB: nSprm = NS_sprm::LN_PDyaBefore; break;
-case RTF_SA: nSprm = NS_sprm::LN_PDyaAfter; break;
 case RTF_ITAP: nSprm = NS_sprm::LN_PTableDepth; break;
 default: break;
 }
@@ -1974,6 +1974,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 {
 case RTF_SBASEDON: nSprm = NS_rtf::LN_ISTDBASE; break;
 case RTF_SNEXT: nSprm = NS_rtf::LN_ISTDNEXT; break;
+case RTF_SB: nSprm = NS_ooxml::LN_CT_Spacing_before; break;
+case RTF_SA: nSprm = NS_ooxml::LN_CT_Spacing_after; break;
 default: break;
 }
 if (nSprm > 0)
@@ -2163,7 +2165,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 if (nParam > 0)
 {
 // NS_sprm::LN_PDyaLine could be used, but that won't work 
with slmult
-
m_aStates.top().aParagraphAttributes->push_back(make_pair(nSprm, pIntValue));
+
m_aStates.top().aParagraphAttributes->push_back(make_pair(NS_ooxml::LN_CT_Spacing_line,
 pIntValue));
 }
 break;
 case RTF_SLMULT:
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx 
b/writerfilter/source/rtftok/rtftokenizer.cxx
index 0a989d8..897e316 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -65,8 +65,8 @@ int RTFTokenizer::resolveParse()
 int ret;
 // for hex chars
 int b = 0, count = 2;
-sal_uInt32 nPercentSize;
-sal_uInt32 nLastPos;
+sal_uInt32 nPercentSize = 0;
+sal_uInt32 nLastPos = 0;
 
 if (m_xStatusIndicator.is())
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 9f15592e08f17908b1e54fed200d0ec6aff29509
Author: Miklos Vajna 
Date:   Thu Jan 12 15:36:31 2012 +0100

fdo#41034 improve RTF import of table cell spacings

1) for empty cells, not only paragraph properties, but but character 
properties should be emitted as well (e.g. font)
2) \sb and \sb is an attribute, not an sprm (it was ignored)
3) \sl was ~ignored due to a typo

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b799508..b2e2f7d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1348,9 +1348,11 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 {
 if (m_bNeedPap)
 {
-// There were no runs in the cell, so we need to send 
paragraph properties here.
-RTFValue::Pointer_t pValue(new 
RTFValue(m_aStates.top().aParagraphAttributes, 
m_aStates.top().aParagraphSprms));
-m_aTableBuffer.push_back(make_pair(BUFFER_PROPS, pValue));
+// There were no runs in the cell, so we need to send 
paragraph and character properties here.
+RTFValue::Pointer_t pPValue(new 
RTFValue(m_aStates.top().aParagraphAttributes, 
m_aStates.top().aParagraphSprms));
+m_aTableBuffer.push_back(make_pair(BUFFER_PROPS, pPValue));
+RTFValue::Pointer_t pCValue(new 
RTFValue(m_aStates.top().aCharacterAttributes, 
m_aStates.top().aCharacterSprms));
+m_aTableBuffer.push_back(make_pair(BUFFER_PROPS, pCValue));
 }
 
 RTFValue::Pointer_t pValue;
@@ -1964,8 +1966,6 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_LIN: nSprm = 0x845e; break;
 case RTF_RI: nSprm = NS_sprm::LN_PDxaRight; break;
 case RTF_RIN: nSprm = 0x845d; break;
-case RTF_SB: nSprm = NS_sprm::LN_PDyaBefore; break;
-case RTF_SA: nSprm = NS_sprm::LN_PDyaAfter; break;
 case RTF_ITAP: nSprm = NS_sprm::LN_PTableDepth; break;
 default: break;
 }
@@ -1983,6 +1983,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 {
 case RTF_SBASEDON: nSprm = NS_rtf::LN_ISTDBASE; break;
 case RTF_SNEXT: nSprm = NS_rtf::LN_ISTDNEXT; break;
+case RTF_SB: nSprm = NS_ooxml::LN_CT_Spacing_before; break;
+case RTF_SA: nSprm = NS_ooxml::LN_CT_Spacing_after; break;
 default: break;
 }
 if (nSprm > 0)
@@ -2172,7 +2174,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 if (nParam > 0)
 {
 // NS_sprm::LN_PDyaLine could be used, but that won't work 
with slmult
-
m_aStates.top().aParagraphAttributes->push_back(make_pair(nSprm, pIntValue));
+
m_aStates.top().aParagraphAttributes->push_back(make_pair(NS_ooxml::LN_CT_Spacing_line,
 pIntValue));
 }
 break;
 case RTF_SLMULT:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/inc svx/source writerfilter/inc writerfilter/Library_rtftok.mk writerfilter/source

[Miklos Vajna]

 svx/inc/svx/dialogs.hrc   |1 
 svx/source/stbctrls/stbctrls.src  |5 +++
 writerfilter/Library_rtftok.mk|1 
 writerfilter/inc/rtftok/RTFDocument.hxx   |4 ++
 writerfilter/source/filter/RtfFilter.cxx  |8 +
 writerfilter/source/rtftok/rtfdocumentfactory.cxx |5 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|8 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|4 ++
 writerfilter/source/rtftok/rtftokenizer.cxx   |   30 --
 writerfilter/source/rtftok/rtftokenizer.hxx   |3 +-
 10 files changed, 58 insertions(+), 11 deletions(-)

New commits:
commit fe2395678a2d31e5e809e52bb49495cc3ab8b381
Author: Miklos Vajna 
Date:   Tue Jan 10 18:53:55 2012 +0100

fdo#38057 implement RTF import progressbar

(cherry picked from commit 92c7b6733e55a6ab62bc231ecf0ffd5c0da7c8d2)

Conflicts:

writerfilter/source/rtftok/rtftokenizer.cxx

diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 079be0a..76b0c0a 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -1175,5 +1175,6 @@
 #define RID_SVXBMP_DOC_MODIFIED_FEEDBACK (SVX_OOO_BUILD_START + 3)
 #define RID_SVXSTR_DOC_MODIFIED_YES  (SVX_OOO_BUILD_START + 4)
 #define RID_SVXSTR_DOC_MODIFIED_NO   (SVX_OOO_BUILD_START + 5)
+#define RID_SVXSTR_DOC_LOAD  (SVX_OOO_BUILD_START + 6)
 
 #endif
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index c2e0999..dea916d 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -97,6 +97,11 @@ String RID_SVXSTR_DOC_MODIFIED_NO
 Text [ en-US ] = "The document has not been modified since the last save.";
 };
 
+String RID_SVXSTR_DOC_LOAD
+{
+Text [ en-US ] = "Loading document...";
+};
+
  // PopupMenu -
 Menu RID_SVXMNU_ZOOM
 {
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 9ee5cde..3835a5d 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,rtftok,\
utl \
tl \
resourcemodel \
+   vcl \
$(gb_STDLIBS) \
 ))
 
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx 
b/writerfilter/inc/rtftok/RTFDocument.hxx
index 72fe6bd..15b94eb 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace writerfilter {
 namespace rtftok {
@@ -62,7 +63,8 @@ namespace writerfilter {
 ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext > const & xContext,
 ::com::sun::star::uno::Reference< 
::com::sun::star::io::XInputStream > const & xInputStream,
 ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XComponent > const & xDstDoc,
-::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame > const & xFrame);
+::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame > const & xFrame,
+::com::sun::star::uno::Reference< 
::com::sun::star::task::XStatusIndicator > const & xStatusIndicator);
 };
 } // namespace rtftok
 } // namespace writerfilter
diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index 8786539..067fae9 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::rtl;
 using namespace ::cppu;
@@ -89,14 +90,19 @@ sal_Bool RtfFilter::filter( const uno::Sequence< 
beans::PropertyValue >& aDescri
 uno::Reference xFrame = 
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_FRAME(),
 uno::Reference());
 
+uno::Reference xStatusIndicator = 
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_STATUSINDICATOR(),
+uno::Reference());
+
 writerfilter::Stream::Pointer_t pStream(
 new writerfilter::dmapper::DomainMapper(m_xContext, 
xInputStream, m_xDstDoc, writerfilter::dmapper::DOCUMENT_RTF));
 writerfilter::rtftok::RTFDocument::Pointer_t const pDocument(
-
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, 
xInputStream, m_xDstDoc, xFrame));
+
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, 
xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
 pDocument->resolve(*pStream);
 #ifdef DEBUG_IMPORT
 dmapperLogger->endDocument();
 #endif
+if (xStatusIndicator.is())
+xStatusIndicator->end();
 return sal_True;
 }
 catch (const uno::Except

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5d097dfb44ab1d7a41000b8be2ff2ee680de94f9
Author: Fridrich Å trba 
Date:   Thu Jan 12 15:01:13 2012 +0100

Logical error in writerperfect

Signed-off-by: Fridrich Å trba 

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 584e8cc..fbafb02 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -948,7 +948,7 @@ void OdgGenerator::drawPath(const WPXPropertyListVector 
&path)
 
 void OdgGenerator::drawGraphicObject(const ::WPXPropertyList &propList, const 
::WPXBinaryData &binaryData)
 {
-if (!propList["libwpg:mime-type"] && 
propList["libwpg:mime-type"]->getStr().len() <= 0)
+if (!propList["libwpg:mime-type"] || 
propList["libwpg:mime-type"]->getStr().len() <= 0)
 return;
 
 mpImpl->_writeGraphicsStyle();
commit 8d5d687354bb470033ed9ab63d8875bc4e34c096
Author: Fridrich Å trba 
Date:   Thu Jan 12 12:15:29 2012 +0100

Consider the style:mirror property

Signed-off-by: Fridrich Å trba 

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 4d70f8d..584e8cc 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -950,10 +950,16 @@ void OdgGenerator::drawGraphicObject(const 
::WPXPropertyList &propList, const ::
 {
 if (!propList["libwpg:mime-type"] && 
propList["libwpg:mime-type"]->getStr().len() <= 0)
 return;
+
+mpImpl->_writeGraphicsStyle();
+
 TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
 
 
 WPXString sValue;
+sValue.sprintf("gr%i", mpImpl->miGraphicsStyleIndex-1);
+pDrawFrameElement->addAttribute("draw:style-name", sValue);
+
 if (propList["svg:x"])
 pDrawFrameElement->addAttribute("svg:x", propList["svg:x"]->getStr());
 if (propList["svg:y"])
@@ -1280,6 +1286,8 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
 else
 
pStyleGraphicsPropertiesElement->addAttribute("draw:marker-end-width", 
"0.118in");
 }
+if (mxStyle["style:mirror"])
+pStyleGraphicsPropertiesElement->addAttribute("style:mirror", 
mxStyle["style:mirror"]->getStr());
 
 mGraphicsAutomaticStyles.push_back(pStyleGraphicsPropertiesElement);
 mGraphicsAutomaticStyles.push_back(new 
TagCloseElement("style:graphic-properties"));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e198eea5a87bff84783bd038cf134e6ea3b764ad
Author: Fridrich Å trba 
Date:   Thu Jan 12 15:01:13 2012 +0100

Logical error in writerperfect

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 584e8cc..fbafb02 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -948,7 +948,7 @@ void OdgGenerator::drawPath(const WPXPropertyListVector 
&path)
 
 void OdgGenerator::drawGraphicObject(const ::WPXPropertyList &propList, const 
::WPXBinaryData &binaryData)
 {
-if (!propList["libwpg:mime-type"] && 
propList["libwpg:mime-type"]->getStr().len() <= 0)
+if (!propList["libwpg:mime-type"] || 
propList["libwpg:mime-type"]->getStr().len() <= 0)
 return;
 
 mpImpl->_writeGraphicsStyle();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

[Michel Loiseleur]

 l10ntools/source/helpex.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2994b7b983b6df38b9cc3c778728a1bd55a671c0
Author: Loiseleur Michel 
Date:   Thu Jan 12 14:45:02 2012 +0100

fix build error in l10ntools

On gcc-4.4.3, it fixes this error : l10ntools/source/helpex.cxx:82: error: 
parameter may not have variably modified type 'rtl::OString [(((long unsigned 
int)(((long int)i) + -0x1)) + 1)]'

diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 2680c59..f06f618 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -79,7 +79,7 @@ sal_Bool ParseCommandLine( int argc, char* argv[])
 // parse command line
 for( int i = 1; i < argc; i++ )
 {
-rtl::OString aArg(rtl::OString(argv[i]).toAsciiUpperCase());
+rtl::OString aArg = rtl::OString(argv[i]).toAsciiUpperCase();
 if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-I")))
 nState = STATE_INPUT; // next tokens specifies source files
 else if (aArg.equalsL(RTL_CONSTASCII_STRINGPARAM("-O")))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sysui/desktop

[Andras Timar]

 sysui/desktop/icons/base_app.ico|binary
 sysui/desktop/icons/calc_app.ico|binary
 sysui/desktop/icons/database.ico|binary
 sysui/desktop/icons/draw_app.ico|binary
 sysui/desktop/icons/drawing-template.ico|binary
 sysui/desktop/icons/drawing.ico |binary
 sysui/desktop/icons/empty-document.ico  |binary
 sysui/desktop/icons/empty-template.ico  |binary
 sysui/desktop/icons/formula.ico |binary
 sysui/desktop/icons/hicolor/256x256/apps/calc.png   |binary
 sysui/desktop/icons/hicolor/256x256/apps/writer.png |binary
 sysui/desktop/icons/impress_app.ico |binary
 sysui/desktop/icons/main_app.ico|binary
 sysui/desktop/icons/master-document.ico |binary
 sysui/desktop/icons/math_app.ico|binary
 sysui/desktop/icons/oasis-database.ico  |binary
 sysui/desktop/icons/oasis-drawing-template.ico  |binary
 sysui/desktop/icons/oasis-drawing.ico   |binary
 sysui/desktop/icons/oasis-empty-document.ico|binary
 sysui/desktop/icons/oasis-empty-template.ico|binary
 sysui/desktop/icons/oasis-formula.ico   |binary
 sysui/desktop/icons/oasis-master-document.ico   |binary
 sysui/desktop/icons/oasis-presentation-template.ico |binary
 sysui/desktop/icons/oasis-presentation.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet-template.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet.ico   |binary
 sysui/desktop/icons/oasis-text-template.ico |binary
 sysui/desktop/icons/oasis-text.ico  |binary
 sysui/desktop/icons/oasis-web-template.ico  |binary
 sysui/desktop/icons/open.ico|binary
 sysui/desktop/icons/presentation-template.ico   |binary
 sysui/desktop/icons/presentation.ico|binary
 sysui/desktop/icons/spreadsheet-template.ico|binary
 sysui/desktop/icons/spreadsheet.ico |binary
 sysui/desktop/icons/text-template.ico   |binary
 sysui/desktop/icons/text.ico|binary
 sysui/desktop/icons/writer_app.ico  |binary
 37 files changed

New commits:
commit 55f45dbf89233f0d529c4c6659c50c05f683add7
Author: Andras Timar 
Date:   Thu Jan 12 13:32:38 2012 +0100

256x256 Windows icons fdo#39555

diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico
index 02cf7a4..97b6110 100644
Binary files a/sysui/desktop/icons/base_app.ico and 
b/sysui/desktop/icons/base_app.ico differ
diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico
index a9dd646..388ac6d 100644
Binary files a/sysui/desktop/icons/calc_app.ico and 
b/sysui/desktop/icons/calc_app.ico differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
index 02cf7a4..97b6110 100644
Binary files a/sysui/desktop/icons/database.ico and 
b/sysui/desktop/icons/database.ico differ
diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico
index 5297dae..48749da 100644
Binary files a/sysui/desktop/icons/draw_app.ico and 
b/sysui/desktop/icons/draw_app.ico differ
diff --git a/sysui/desktop/icons/drawing-template.ico 
b/sysui/desktop/icons/drawing-template.ico
index af2e9ff..9991270 100644
Binary files a/sysui/desktop/icons/drawing-template.ico and 
b/sysui/desktop/icons/drawing-template.ico differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
index 5297dae..48749da 100644
Binary files a/sysui/desktop/icons/drawing.ico and 
b/sysui/desktop/icons/drawing.ico differ
diff --git a/sysui/desktop/icons/empty-document.ico 
b/sysui/desktop/icons/empty-document.ico
index 20e665f..ec11e8f 100644
Binary files a/sysui/desktop/icons/empty-document.ico and 
b/sysui/desktop/icons/empty-document.ico differ
diff --git a/sysui/desktop/icons/empty-template.ico 
b/sysui/desktop/icons/empty-template.ico
index 20e665f..ec11e8f 100644
Binary files a/sysui/desktop/icons/empty-template.ico and 
b/sysui/desktop/icons/empty-template.ico differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
index fb2f651..07b3e8e 100644
Binary files a/sysui/desktop/icons/formula.ico and 
b/sysui/desktop/icons/formula.ico differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png 
b/sysui/desktop/icons/hicolor/256x256/apps/calc.png
index 3ce322a..a3f5fd4 100644
Binary files a/sysui/desktop/icons/hicolor/256x256/apps/calc.png and 
b/sysui/desktop/icons/hicolor/256x256/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png
index 80af4bd..2f4abcb 100644
Binary files a/sysui/desktop/icons/hicolor/256x256/apps/writer.png and 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ
diff --git a/sysui/desktop/icons/impress_app.ico 
b/sysui/desktop/icons/impr

[Libreoffice-commits] .: sysui/desktop

[Andras Timar]

 sysui/desktop/icons/base_app.ico|binary
 sysui/desktop/icons/calc_app.ico|binary
 sysui/desktop/icons/database.ico|binary
 sysui/desktop/icons/draw_app.ico|binary
 sysui/desktop/icons/drawing-template.ico|binary
 sysui/desktop/icons/drawing.ico |binary
 sysui/desktop/icons/empty-document.ico  |binary
 sysui/desktop/icons/empty-template.ico  |binary
 sysui/desktop/icons/formula.ico |binary
 sysui/desktop/icons/hicolor/256x256/apps/calc.png   |binary
 sysui/desktop/icons/hicolor/256x256/apps/writer.png |binary
 sysui/desktop/icons/impress_app.ico |binary
 sysui/desktop/icons/main_app.ico|binary
 sysui/desktop/icons/master-document.ico |binary
 sysui/desktop/icons/math_app.ico|binary
 sysui/desktop/icons/oasis-database.ico  |binary
 sysui/desktop/icons/oasis-drawing-template.ico  |binary
 sysui/desktop/icons/oasis-drawing.ico   |binary
 sysui/desktop/icons/oasis-empty-document.ico|binary
 sysui/desktop/icons/oasis-empty-template.ico|binary
 sysui/desktop/icons/oasis-formula.ico   |binary
 sysui/desktop/icons/oasis-master-document.ico   |binary
 sysui/desktop/icons/oasis-presentation-template.ico |binary
 sysui/desktop/icons/oasis-presentation.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet-template.ico  |binary
 sysui/desktop/icons/oasis-spreadsheet.ico   |binary
 sysui/desktop/icons/oasis-text-template.ico |binary
 sysui/desktop/icons/oasis-text.ico  |binary
 sysui/desktop/icons/oasis-web-template.ico  |binary
 sysui/desktop/icons/open.ico|binary
 sysui/desktop/icons/presentation-template.ico   |binary
 sysui/desktop/icons/presentation.ico|binary
 sysui/desktop/icons/spreadsheet-template.ico|binary
 sysui/desktop/icons/spreadsheet.ico |binary
 sysui/desktop/icons/text-template.ico   |binary
 sysui/desktop/icons/text.ico|binary
 sysui/desktop/icons/writer_app.ico  |binary
 37 files changed

New commits:
commit bc4ff4382964da57b8c36c115b0517d884127df3
Author: Andras Timar 
Date:   Thu Jan 12 13:32:38 2012 +0100

256x256 Windows icons fdo#39555

diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico
index 02cf7a4..97b6110 100644
Binary files a/sysui/desktop/icons/base_app.ico and 
b/sysui/desktop/icons/base_app.ico differ
diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico
index a9dd646..388ac6d 100644
Binary files a/sysui/desktop/icons/calc_app.ico and 
b/sysui/desktop/icons/calc_app.ico differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
index 02cf7a4..97b6110 100644
Binary files a/sysui/desktop/icons/database.ico and 
b/sysui/desktop/icons/database.ico differ
diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico
index 5297dae..48749da 100644
Binary files a/sysui/desktop/icons/draw_app.ico and 
b/sysui/desktop/icons/draw_app.ico differ
diff --git a/sysui/desktop/icons/drawing-template.ico 
b/sysui/desktop/icons/drawing-template.ico
index af2e9ff..9991270 100644
Binary files a/sysui/desktop/icons/drawing-template.ico and 
b/sysui/desktop/icons/drawing-template.ico differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
index 5297dae..48749da 100644
Binary files a/sysui/desktop/icons/drawing.ico and 
b/sysui/desktop/icons/drawing.ico differ
diff --git a/sysui/desktop/icons/empty-document.ico 
b/sysui/desktop/icons/empty-document.ico
index 20e665f..ec11e8f 100644
Binary files a/sysui/desktop/icons/empty-document.ico and 
b/sysui/desktop/icons/empty-document.ico differ
diff --git a/sysui/desktop/icons/empty-template.ico 
b/sysui/desktop/icons/empty-template.ico
index 20e665f..ec11e8f 100644
Binary files a/sysui/desktop/icons/empty-template.ico and 
b/sysui/desktop/icons/empty-template.ico differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
index fb2f651..07b3e8e 100644
Binary files a/sysui/desktop/icons/formula.ico and 
b/sysui/desktop/icons/formula.ico differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png 
b/sysui/desktop/icons/hicolor/256x256/apps/calc.png
index 3ce322a..a3f5fd4 100644
Binary files a/sysui/desktop/icons/hicolor/256x256/apps/calc.png and 
b/sysui/desktop/icons/hicolor/256x256/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png
index 80af4bd..2f4abcb 100644
Binary files a/sysui/desktop/icons/hicolor/256x256/apps/writer.png and 
b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ
diff --git a/sysui/desktop/icons/impress_app.ico 
b/sysui/desktop/icons/impr

[Libreoffice-commits] .: sc/CppunitTest_sc_filters_test.mk sc/prj

[Stephan Bergmann]

 sc/CppunitTest_sc_filters_test.mk |1 +
 sc/prj/build.lst  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit de9dd8f969b90b8eafa69d9527a7aeb53a585e3b
Author: Stephan Bergmann 
Date:   Thu Jan 12 13:51:56 2012 +0100

Missing component dependency.

diff --git a/sc/CppunitTest_sc_filters_test.mk 
b/sc/CppunitTest_sc_filters_test.mk
index c6b69f1..4ad57ba 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
+basic/util/sb \
 chart2/source/controller/chartcontroller \
 chart2/source/tools/charttools \
 chart2/source/model/chartmodel \
diff --git a/sc/prj/build.lst b/sc/prj/build.lst
index 27b7c30..bbc6303 100644
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -1,2 +1,2 @@
-sc  sc  :   filter TRANSLATIONS:translations vbahelper oovbaapi 
svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test 
xmloff desktop ucb package configmgr officecfg scripting NULL
+sc  sc  : basic filter TRANSLATIONS:translations vbahelper oovbaapi 
svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test 
xmloff desktop ucb package configmgr officecfg scripting NULL
 sc sc\prj nmake - all sc_prj   NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: test/prj

[Caolán McNamara]

 test/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 66be03c7490e160721884806fc959c29faa8063f
Author: Caolán McNamara 
Date:   Thu Jan 12 12:43:18 2012 +

wrong depend

diff --git a/test/prj/build.lst b/test/prj/build.lst
index b58dc5b..a06591b 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,2 +1,2 @@
-te test : unotest vcl i18npool filters NULL
+te test : unotest vcl i18npool NULL
 te test\source nmake - all source_cpp NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx

[Stephan Bergmann]

 vcl/unx/source/fontmanager/fontconfig.cxx |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 29a7cd20ac892003e3bbc622657a6028adc83759
Author: Caolán McNamara 
Date:   Wed Jan 11 20:47:54 2012 +

Resolves:fdo#44078 fix unfortunate name alias mixups with DejaVu fonts

Cherry-picked from 
.

Signed-off-by: Stephan Bergmann 

diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx 
b/vcl/unx/source/fontmanager/fontconfig.cxx
index a60da2a..ab2ff6b 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx
@@ -297,7 +297,7 @@ public:
 boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > 
m_aFontNameToLocalized;
 boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > 
m_aLocalizedToCanonical;
 private:
-void cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname, 
const std::vector< lang_and_element > &lang_and_elements);
+void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 
*bestfontname, const std::vector< lang_and_element > &lang_and_elements);
 };
 
 oslGenericFunction FontCfgWrapper::loadSymbol( const char* pSymbol )
@@ -659,6 +659,7 @@ namespace
 
 std::vector::const_iterator aEnd = elements.end();
 bool alreadyclosematch = false;
+bool found_fallback_englishname = false;
 for( std::vector::const_iterator aIter = 
elements.begin(); aIter != aEnd; ++aIter )
 {
 const char *pLang = (const char*)aIter->first;
@@ -670,7 +671,8 @@ namespace
 }
 else if( alreadyclosematch )
 {
-// override candidate only if there is a perfect match
+// current candidate matches lang of lang-TERRITORY
+// override candidate only if there is a full match
 continue;
 }
 else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0)
@@ -679,10 +681,18 @@ namespace
 candidate = aIter->second;
 alreadyclosematch = true;
 }
+else if( found_fallback_englishname )
+{
+// already found an english fallback, don't override candidate
+// unless there is a better language match
+continue;
+}
 else if( rtl_str_compare( pLang, "en") == 0)
 {
-// fallback to the english element name
+// select a fallback candidate of the first english element
+// name
 candidate = aIter->second;
+found_fallback_englishname = true;
 }
 }
 return candidate;
@@ -690,7 +700,8 @@ namespace
 }
 
 //Set up maps to quickly map between a fonts best UI name and all the rest of 
its names, and vice versa
-void FontCfgWrapper::cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 
*bestfontname, const std::vector< lang_and_element > &lang_and_elements)
+void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname, 
const FcChar8 *bestfontname,
+const std::vector< lang_and_element > &lang_and_elements)
 {
 std::vector::const_iterator aEnd = 
lang_and_elements.end();
 for (std::vector::const_iterator aIter = 
lang_and_elements.begin(); aIter != aEnd; ++aIter)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - l10ntools/scripts

[David Tardon]

 l10ntools/scripts/fast_merge.pl |   29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

New commits:
commit e0192b517564f43ea6a0f3ef5fe57def2bfd2a3c
Author: David Tardon 
Date:   Wed Jan 11 14:04:54 2012 +0100

fix writing of strings from the first module

Signed-off-by: David Tardon 

diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index 5dc63cf..cc632e4 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -89,11 +89,10 @@ while( hasLines() )
 }
 write_lines();
 }
-if( $#current+1 ne 0 )
+# write content of the last localize.sdf file
+if( $#buffer ge 0 )
 {
-( $path , $localize_file ) = make_paths();
-add_to_buffer();
-write_buffer( $path , $localize_file );
+write_buffer( $last_path , $last_localize_file );
 }
 release_lock();
 exit( 0 );
@@ -248,15 +247,14 @@ sub make_paths
 
 return ( $path , $localizeFile );
 }
+
 sub write_lines
 {
 if( $first_run ){
-add_to_buffer();
 my( $path , $localize_file ) = make_paths();
 $last_path = $path;
 $last_localize_file = $localize_file;
-mkpath $path;
-write_buffer( $path , $localize_file );
+add_to_buffer();
 $first_run = '';
 }
 else
@@ -269,7 +267,6 @@ sub write_lines
 }
 else
 {
-mkpath $path;
 write_buffer( $last_path , $last_localize_file );
 add_to_buffer();
 $last_path = $path;
@@ -277,6 +274,11 @@ sub write_lines
 }
 }
 }
+
+# Adds all lines that contain strings from one source file from every input 
file.
+# TODO: Would it not be better to add lines for all files from a directory 
(i.e., replace
+# "$afile eq $elem->file" by "$adir eq $elem->dir")? We could get rid of the 
delayed
+# writing then. But maybe there is a reason for doing it this way...
 sub add_to_buffer
 {
 my $plainline;
@@ -293,12 +295,15 @@ sub add_to_buffer
 } while ( !$elem->endoffile && $amodule eq $elem->module && $afile eq 
$elem->file );
 }
 }
+
+# Writes the buffer to currently selected localize.sdf file.
 sub write_buffer
 {
 my $path= shift;
 my $localize_file   = shift;
 my $cnt = $#buffer+1;
 print "Write to $path $cnt lines\n";
+mkpath $path;
 open FILE , ">>$localize_file" or die "Can't open file '$localize_file'\n";
 foreach ( @buffer )
 {
commit ab69b4e6c09651e7462758bf41f992eb41c038af
Author: David Tardon 
Date:   Wed Jan 11 11:42:09 2012 +0100

Revert "fast_merge: fix mis-merge of first module's strings"

This is not enough, because the file is still wrong.

This reverts commit 47a8454f5f76030203ce6458cf63d4348bdacffe.

Signed-off-by: David Tardon 

diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index 73b824e..5dc63cf 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -91,7 +91,7 @@ while( hasLines() )
 }
 if( $#current+1 ne 0 )
 {
-( $path , $localize_file ) = make_paths($current[ 0 ]->module);
+( $path , $localize_file ) = make_paths();
 add_to_buffer();
 write_buffer( $path , $localize_file );
 }
@@ -240,8 +240,7 @@ sub hasLines
 
 sub make_paths
 {
-my $module = shift ;
-my $localizeFile = $merge_dir."\\".$module."\\".$current[ 0 ]->file;
+my $localizeFile = $merge_dir."\\".$current[ 0 ]->module."\\".$current[ 0 
]->file;
 my $path = getDir( $localizeFile );
 $path =~ s/\\/\//g;
 
@@ -252,9 +251,8 @@ sub make_paths
 sub write_lines
 {
 if( $first_run ){
-my $module = $current[ 0 ]->module;
 add_to_buffer();
-my( $path , $localize_file ) = make_paths($module);
+my( $path , $localize_file ) = make_paths();
 $last_path = $path;
 $last_localize_file = $localize_file;
 mkpath $path;
@@ -264,7 +262,7 @@ sub write_lines
 else
 {
 return , if ( $#current+1 eq 0 );
-my( $path , $localize_file ) = make_paths($current[ 0 ]->module);
+my( $path , $localize_file ) = make_paths();
 if( $path eq $last_path )
 {
 add_to_buffer();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - l10ntools/scripts

[David Tardon]

 l10ntools/scripts/fast_merge.pl |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit d3dca82e81c32433756ab7d92b1b8f901b9b23b5
Author: David Tardon 
Date:   Wed Jan 11 14:04:54 2012 +0100

fix writing of strings from the first module

Signed-off-by: Andras Timar 

diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index e9c36d0..c84f00b 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -89,11 +89,10 @@ while( hasLines() )
 }
 write_lines();
 }
-if( $#current+1 ne 0 )
+# write content of the last localize.sdf file
+if( $#buffer ge 0 )
 {
-( $path , $localize_file ) = make_paths();
-add_to_buffer();
-write_buffer( $path , $localize_file );
+write_buffer( $last_path , $last_localize_file );
 }
 release_lock();
 exit( 0 );
@@ -248,15 +247,14 @@ sub make_paths
 
 return ( $path , $localizeFile );
 }
+
 sub write_lines
 {
 if( $first_run ){
-add_to_buffer();
 my( $path , $localize_file ) = make_paths();
 $last_path = $path;
 $last_localize_file = $localize_file;
-mkpath $path;
-write_buffer( $path , $localize_file );
+add_to_buffer();
 $first_run = '';
 }
 else
@@ -269,7 +267,6 @@ sub write_lines
 }
 else
 {
-mkpath $path;
 write_buffer( $last_path , $last_localize_file );
 add_to_buffer();
 $last_path = $path;
@@ -277,6 +274,11 @@ sub write_lines
 }
 }
 }
+
+# Adds all lines that contain strings from one source file from every input 
file.
+# TODO: Would it not be better to add lines for all files from a directory 
(i.e., replace
+# "$afile eq $elem->file" by "$adir eq $elem->dir")? We could get rid of the 
delayed
+# writing then. But maybe there is a reason for doing it this way...
 sub add_to_buffer
 {
 my $plainline;
@@ -293,12 +295,15 @@ sub add_to_buffer
 } while ( !$elem->endoffile && $amodule eq $elem->module && $afile eq 
$elem->file );
 }
 }
+
+# Writes the buffer to currently selected localize.sdf file.
 sub write_buffer
 {
 my $path= shift;
 my $localize_file   = shift;
 my $cnt = $#buffer+1;
 print "Write to $path $cnt lines\n";
+mkpath $path;
 open FILE , ">>$localize_file" or die "Can't open file '$localize_file'\n";
 foreach ( @buffer )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit b9e50a307122b6d16f43581f128a782ba10e3f7f
Author: Fridrich Å trba 
Date:   Thu Jan 12 12:15:29 2012 +0100

Consider the style:mirror property

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index 4d70f8d..584e8cc 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -950,10 +950,16 @@ void OdgGenerator::drawGraphicObject(const 
::WPXPropertyList &propList, const ::
 {
 if (!propList["libwpg:mime-type"] && 
propList["libwpg:mime-type"]->getStr().len() <= 0)
 return;
+
+mpImpl->_writeGraphicsStyle();
+
 TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
 
 
 WPXString sValue;
+sValue.sprintf("gr%i", mpImpl->miGraphicsStyleIndex-1);
+pDrawFrameElement->addAttribute("draw:style-name", sValue);
+
 if (propList["svg:x"])
 pDrawFrameElement->addAttribute("svg:x", propList["svg:x"]->getStr());
 if (propList["svg:y"])
@@ -1280,6 +1286,8 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
 else
 
pStyleGraphicsPropertiesElement->addAttribute("draw:marker-end-width", 
"0.118in");
 }
+if (mxStyle["style:mirror"])
+pStyleGraphicsPropertiesElement->addAttribute("style:mirror", 
mxStyle["style:mirror"]->getStr());
 
 mGraphicsAutomaticStyles.push_back(pStyleGraphicsPropertiesElement);
 mGraphicsAutomaticStyles.push_back(new 
TagCloseElement("style:graphic-properties"));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 6 commits - editeng/inc editeng/source hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk svtools/inc svtools/source test/prj unusedcode.easy vcl/generic vcl/inc vcl/source xml

[Caolán McNamara]

 editeng/inc/editeng/unofdesc.hxx  |1 
 editeng/source/uno/unofdesc.cxx   |   24 -
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk |1 
 svtools/inc/svtools/collatorres.hxx   |9 
 svtools/source/control/collatorres.cxx|   26 -
 test/prj/build.lst|2 
 unusedcode.easy   |4 
 vcl/generic/fontmanager/fontmanager.cxx   |  358 --
 vcl/generic/print/glyphset.cxx|   25 -
 vcl/generic/print/glyphset.hxx|3 
 vcl/inc/unx/strhelper.hxx |   44 --
 vcl/inc/vcl/fontmanager.hxx   |   27 -
 vcl/inc/vcl/strhelper.hxx |   70 ++--
 vcl/source/helper/strhelper.cxx   |7 
 xmlsecurity/source/framework/buffernode.cxx   |   34 --
 xmlsecurity/source/framework/buffernode.hxx   |1 
 16 files changed, 59 insertions(+), 577 deletions(-)

New commits:
commit 7d42c86f660b65f86a864a6b674dc8cba107911c
Author: Caolán McNamara 
Date:   Thu Jan 12 10:28:08 2012 +

pesky dependencies

diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk 
b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index a6722cc..7beda1a 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -78,7 +78,6 @@ $(eval $(call 
gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
 # we need to explicitly depend on library hwp because it is not implied
 # by a link relation
 $(call gb_CppunitTest_get_target,hwpfilter_test_hwpfilter) : \
-$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,hwp)
 
 # vim: set noet sw=4 ts=4:
diff --git a/test/prj/build.lst b/test/prj/build.lst
index a06591b..b58dc5b 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,2 +1,2 @@
-te test : unotest vcl i18npool NULL
+te test : unotest vcl i18npool filters NULL
 te test\source nmake - all source_cpp NULL
commit 87ceb5c987f8bf546bbc0c0fc3447c640780be91
Author: Caolán McNamara 
Date:   Thu Jan 12 09:30:09 2012 +

VCL_DLLPUBLIC is in the wrong place

and there's a unused duplicate header here too which can go

diff --git a/vcl/inc/unx/strhelper.hxx b/vcl/inc/unx/strhelper.hxx
deleted file mode 100644
index 78db605..000
--- a/vcl/inc/unx/strhelper.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _SV_STRHELPER_HXX
-#define _SV_STRHELPER_HXX
-#include 
-
-String GetCommandLineToken( int, const String& );
-// gets one token of a unix command line style string
-// doublequote, singlequote and singleleftquote protect their respective
-// contents
-
-int GetCommandLineTokenCount( const String& );
-// returns number of tokens (zero if empty or whitespace only)
-
-String WhitespaceToSpace( const String&, BOOL bProtect = TRUE );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx
index 62e4fc0..fa8258d 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/vcl/inc/vcl/strhelper.hxx
@@ -35,47 +35,47 @@
 
 #include 
 
-namespace psp {
+namespace psp
+{
+VCL_DLLPUBLIC String GetCommandLineToken( int, const String& );
+VCL_DLLPUBLIC rtl::OString GetCommandLineToken(int, const rtl::OString&);
+// gets one token of a unix command line style string
+// doublequote, singlequote and singleleftquote protect their respective
+// contents
 
-String VCL_DLLPUBLIC GetCommandLineToken( int, const String& );
-rtl::OString VCL_DLLPUBLIC GetCommandLineToken(int, const rtl::OString&);
-// gets one token of a unix command line style string
-// doublequote, singlequo

[Libreoffice-commits] .: desktop/scripts

[Stephan Bergmann]

 desktop/scripts/soffice.sh |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 4f00cdfec54a574e25f47dab2f65b299ea64ec73
Author: Stephan Bergmann 
Date:   Thu Jan 12 11:34:10 2012 +0100

valgrind.log creates more problems than it solves.

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 130f047..1ae4fb7 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -151,12 +151,6 @@ if [ -n "$GDBTRACECHECK" ] ; then
 exec $GDBTRACECHECK "$sd_prog/soffice.bin" "$@"
 fi
 
-# valgrind --log-file=valgrind.log does not work well with --trace-children=yes
-if [ -n "$VALGRINDCHECK" ] ; then
-echo "redirecting the standard and the error output to valgrind.log"
-exec &>valgrind.log
-fi
-
 # do not pass the request for command line help to oosplash
 if test "$#" -eq 1; then
 case "$1" in
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - svx/source tools/inc tools/source

[Radek Doulík]

 svx/source/customshapes/EnhancedCustomShape2d.cxx |6 +++---
 tools/inc/tools/poly.hxx  |3 ++-
 tools/source/generic/poly.cxx |5 -
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 1ceb8e1878be513f260c6d7fbe7066627fca0693
Author: Radek Doulik 
Date:   Thu Jan 12 11:07:51 2012 +0100

fix ooxml custom shapes with 360 degree arcs

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 948fff5..ee8a365 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1407,7 +1407,7 @@ void EnhancedCustomShape2d::SwapStartAndEndArrow( 
SdrObject* pObj ) //#108274
 pObj->SetMergedItem( aLineEndCenter );
 }
 
-basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, 
const Point& rEnd, const sal_Bool bClockwise )
+basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, 
const Point& rEnd, const sal_Bool bClockwise, sal_Bool bFullCircle = sal_False )
 {
 Rectangle aRect( rRect );
 Point aStart( rStart );
@@ -1430,7 +1430,7 @@ basegfx::B2DPolygon CreateArc( const Rectangle& rRect, 
const Point& rStart, cons
 }
 }
 
-Polygon aTempPoly( aRect, aStart, aEnd, POLY_ARC );
+Polygon aTempPoly( aRect, aStart, aEnd, POLY_ARC, bFullCircle );
 basegfx::B2DPolygon aRetval;
 
 if ( bClockwise )
@@ -1757,7 +1757,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& 
rSrcPt, sal_uInt16& rSegm
 OSL_TRACE("ARCANGLETO rect: %d, %d   x   %d, %d   
start: %d, %d end: %d, %d clockwise: %d",
   aRect.Left(), aRect.Top(), 
aRect.Right(), aRect.Bottom(),
   aStartPoint.X(), aStartPoint.Y(), 
aEndPoint.X(), aEndPoint.Y(), bClockwise);
-aNewB2DPolygon.append(CreateArc( aRect, bClockwise 
? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise));
+aNewB2DPolygon.append(CreateArc( aRect, bClockwise 
? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise, 
aStartPoint == aEndPoint && fSwingAngle > F_PI));
 }
 
 rSrcPt += 2;
commit e4cd111fae5f9b781471d4150915bb189eff90ef
Author: Radek Doulik 
Date:   Thu Jan 12 11:06:11 2012 +0100

make it possible to create 360 degrees arc (circle)

diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index 5923266..480b357 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -140,7 +140,8 @@ public:
  sal_uInt16 nPoints = 0 );
 Polygon( const Rectangle& rBound,
  const Point& rStart, const Point& rEnd,
- PolyStyle ePolyStyle = POLY_ARC );
+ PolyStyle ePolyStyle = POLY_ARC,
+ sal_Bool bWholeCircle = sal_False );
 Polygon( const Point& rBezPt1, const Point& rCtrlPt1,
  const Point& rBezPt2, const Point& rCtrlPt2,
  sal_uInt16 nPoints = 0 );
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index f062b9e..14b34d3 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -510,7 +510,7 @@ Polygon::Polygon( const Point& rCenter, long nRadX, long 
nRadY, sal_uInt16 nPoin
 // ---
 
 Polygon::Polygon( const Rectangle& rBound,
-  const Point& rStart, const Point& rEnd, PolyStyle eStyle )
+  const Point& rStart, const Point& rEnd, PolyStyle eStyle, 
sal_Bool bFullCircle )
 {
 DBG_CTOR( Polygon, NULL );
 
@@ -547,6 +547,9 @@ Polygon::Polygon( const Rectangle& rBound,
 if( fDiff < 0. )
 fDiff += F_2PI;
 
+if ( bFullCircle )
+fDiff = F_2PI;
+
 // Punktanzahl proportional verkleinern ( fDiff / (2PI) );
 // ist eingentlich nur fuer einen Kreis richtig; wir
 // machen es hier aber trotzdem
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Radek Doulík]

 svx/source/customshapes/EnhancedCustomShape2d.cxx |6 +++---
 tools/inc/tools/poly.hxx  |3 ++-
 tools/source/generic/poly.cxx |5 -
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 1e47b40c79ddb1d3d16d1521a5d8b5960cd37661
Author: Radek Doulik 
Date:   Thu Jan 12 11:07:51 2012 +0100

fix ooxml custom shapes with 360 degree arcs

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 948fff5..ee8a365 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1407,7 +1407,7 @@ void EnhancedCustomShape2d::SwapStartAndEndArrow( 
SdrObject* pObj ) //#108274
 pObj->SetMergedItem( aLineEndCenter );
 }
 
-basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, 
const Point& rEnd, const sal_Bool bClockwise )
+basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStart, 
const Point& rEnd, const sal_Bool bClockwise, sal_Bool bFullCircle = sal_False )
 {
 Rectangle aRect( rRect );
 Point aStart( rStart );
@@ -1430,7 +1430,7 @@ basegfx::B2DPolygon CreateArc( const Rectangle& rRect, 
const Point& rStart, cons
 }
 }
 
-Polygon aTempPoly( aRect, aStart, aEnd, POLY_ARC );
+Polygon aTempPoly( aRect, aStart, aEnd, POLY_ARC, bFullCircle );
 basegfx::B2DPolygon aRetval;
 
 if ( bClockwise )
@@ -1757,7 +1757,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& 
rSrcPt, sal_uInt16& rSegm
 OSL_TRACE("ARCANGLETO rect: %d, %d   x   %d, %d   
start: %d, %d end: %d, %d clockwise: %d",
   aRect.Left(), aRect.Top(), 
aRect.Right(), aRect.Bottom(),
   aStartPoint.X(), aStartPoint.Y(), 
aEndPoint.X(), aEndPoint.Y(), bClockwise);
-aNewB2DPolygon.append(CreateArc( aRect, bClockwise 
? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise));
+aNewB2DPolygon.append(CreateArc( aRect, bClockwise 
? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise, 
aStartPoint == aEndPoint && fSwingAngle > F_PI));
 }
 
 rSrcPt += 2;
commit 72c50c235447f293a3772105fdfdd4f45d09ff9e
Author: Radek Doulik 
Date:   Thu Jan 12 11:06:11 2012 +0100

make it possible to create 360 degrees arc (circle)

diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index 5923266..480b357 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -140,7 +140,8 @@ public:
  sal_uInt16 nPoints = 0 );
 Polygon( const Rectangle& rBound,
  const Point& rStart, const Point& rEnd,
- PolyStyle ePolyStyle = POLY_ARC );
+ PolyStyle ePolyStyle = POLY_ARC,
+ sal_Bool bWholeCircle = sal_False );
 Polygon( const Point& rBezPt1, const Point& rCtrlPt1,
  const Point& rBezPt2, const Point& rCtrlPt2,
  sal_uInt16 nPoints = 0 );
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index fa2d1f5..8c64a9f 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -510,7 +510,7 @@ Polygon::Polygon( const Point& rCenter, long nRadX, long 
nRadY, sal_uInt16 nPoin
 // ---
 
 Polygon::Polygon( const Rectangle& rBound,
-  const Point& rStart, const Point& rEnd, PolyStyle eStyle )
+  const Point& rStart, const Point& rEnd, PolyStyle eStyle, 
sal_Bool bFullCircle )
 {
 DBG_CTOR( Polygon, NULL );
 
@@ -547,6 +547,9 @@ Polygon::Polygon( const Rectangle& rBound,
 if( fDiff < 0. )
 fDiff += F_2PI;
 
+if ( bFullCircle )
+fDiff = F_2PI;
+
 // Punktanzahl proportional verkleinern ( fDiff / (2PI) );
 // ist eingentlich nur fuer einen Kreis richtig; wir
 // machen es hier aber trotzdem
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/jdbc/jdbc.mxp.map |  152 --
 1 file changed, 152 deletions(-)

New commits:
commit 41320291f7a2327447596ff4d66098ccf1bdacfb
Author: Stephan Bergmann 
Date:   Thu Jan 12 10:58:54 2012 +0100

Dead code.

diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map 
b/connectivity/source/drivers/jdbc/jdbc.mxp.map
deleted file mode 100755
index 2437d90..000
--- a/connectivity/source/drivers/jdbc/jdbc.mxp.map
+++ /dev/null
@@ -1,152 +0,0 @@
-component_getFactory
-__mh_dylib_header
-___builtin_delete
-___check_eh_spec
-___cp_pop_exception
-___get_eh_context
-___pure_virtual
-___rtti_class
-___rtti_si
-___rtti_user
-___sjthrow
-___start_cp_handler
-___terminate
-dyld_stub_binding_helper
-rest_world
-save_world
-___builtin_new
-___builtin_vec_delete
-___builtin_vec_new
-___cp_push_exception
-___eh_alloc
-_terminate__Fv
-___eh_rtime_match
-__._10bad_typeid
-__._8bad_cast
-___get_eh_info
-___is_pointer__FPv
-___throw_type_match_rtti
-___vt_10bad_typeid
-___vt_8bad_cast
-__keymgr_get_per_thread_data
-__keymgr_set_per_thread_data
-___tf9exception
-___ti9exception
-___vt_9exception
-_what__C9exception
-__._9bad_alloc
-___tf9bad_alloc
-___vt_9bad_alloc
-__._9type_info
-___eq__C9type_infoRCB0
-___tf16__user_type_info
-___tf9type_info
-___ti9type_info
-___vt_9type_info
-_getMyClass__Q212connectivity14java_sql_Array
-_saveClassRef__Q212connectivity14java_sql_ArrayP7_jclass
-_getMyClass__Q212connectivity13java_sql_Blob
-_saveClassRef__Q212connectivity13java_sql_BlobP7_jclass
-_saveClassRef__Q212connectivity17java_lang_BooleanP7_jclass
-__._Q212connectivity26java_sql_CallableStatement
-_release__Q212connectivity26java_sql_CallableStatement
-_acquire__Q212connectivity26java_sql_CallableStatement
-_saveClassRef__Q212connectivity26java_sql_CallableStatementP7_jclass
-_getMyClass__Q212connectivity26java_sql_CallableStatement
-_getMyClass__Q212connectivity15java_lang_Class
-_saveClassRef__Q212connectivity15java_lang_ClassP7_jclass
-_getMyClass__Q212connectivity13java_sql_Clob
-_saveClassRef__Q212connectivity13java_sql_ClobP7_jclass
-_getMyClass__Q212connectivity19java_sql_Connection
-_saveClassRef__Q212connectivity19java_sql_ConnectionP7_jclass
-_getMyClass__Q212connectivity25java_sql_DatabaseMetaData
-_saveClassRef__Q212connectivity25java_sql_DatabaseMetaDataP7_jclass
-_saveClassRef__Q212connectivity14java_util_DateP7_jclass
-_getMyClass__Q212connectivity14java_util_Date
-_getMyClass__Q212connectivity22java_sql_DriverManager
-_saveClassRef__Q212connectivity22java_sql_DriverManagerP7_jclass
-_choices__CQ212connectivity27java_sql_DriverPropertyInfo
-_value__CQ212connectivity27java_sql_DriverPropertyInfo
-_required__CQ212connectivity27java_sql_DriverPropertyInfo
-_description__CQ212connectivity27java_sql_DriverPropertyInfo
-_name__CQ212connectivity27java_sql_DriverPropertyInfo
-_saveClassRef__Q212connectivity27java_sql_DriverPropertyInfoP7_jclass
-_saveClassRef__Q212connectivity19java_lang_ExceptionP7_jclass
-_getMyClass__Q212connectivity19java_io_InputStream
-_saveClassRef__Q212connectivity19java_io_InputStreamP7_jclass
-_getMyClass__Q212connectivity15java_sql_Driver
-_saveClassRef__Q212connectivity15java_sql_DriverP7_jclass
-___Q212connectivity15java_sql_DriverRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_getMyClass__Q212connectivity16java_lang_Object
-_setError__Q212connectivity15SDBThreadAttach
-_StartJava__Q212connectivity15SDBThreadAttachRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_xInit__Q212connectivity15SDBThreadAttachRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_detachThread__Q212connectivity15SDBThreadAttach
-_attachThread__Q212connectivity15SDBThreadAttachRP7JNIEnv_RCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_release__Q212connectivity26java_sql_PreparedStatement
-_acquire__Q212connectivity26java_sql_PreparedStatement
-_getMyClass__Q212connectivity26java_sql_PreparedStatement
-_saveClassRef__Q212connectivity26java_sql_PreparedStatementP7_jclass
-_getMyClass__Q212connectivity14java_io_Reader
-_saveClassRef__Q212connectivity14java_io_ReaderP7_jclass
-_getMyClass__Q212connectivity12java_sql_Ref
-_saveClassRef__Q212connectivity12java_sql_RefP7_jclass
-__._Q312connectivity4jdbc18UStringDescription
-___Q312connectivity4jdbc18UStringDescriptionPFv_PCc
-_getPropertySetInfo__Q212connectivity18java_sql_ResultSet
-_release__Q212connectivity18java_sql_ResultSet
-_acquire__Q212connectivity18java_sql_ResultSet
-_getResultSetType__CQ212connectivity18java_sql_ResultSet
-_getResultSetConcurrency__CQ212connectivity18java_sql_ResultSet
-_getCursorName__CQ212connectivity18java_sql_ResultSet
-_setFetchSize__Q212connectivity18java_sql_ResultSetl
-_setFetchDirection__Q212connectivity18java_sql_ResultSetl
-_getFetchSize__CQ212connectivity18java_sql_ResultSet
-_getFetchDirection__CQ212connectivity18java_sql_ResultSet
-_saveClassRef__Q212connectivity18java_

[Libreoffice-commits] .: sal/inc

[Stephan Bergmann]

 sal/inc/sal/log.hxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit ddc3458259222720d000ccc9cc5e6bd9b09ef3c9
Author: Stephan Bergmann 
Date:   Thu Jan 12 10:57:41 2012 +0100

Make it clear that sal/log.hxx functionality may change again.

diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index 6eb152b..816d57a 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -153,6 +153,9 @@ inline char const * unwrapStream(StreamIgnore const &) {
 Potentially not only useful within the log framework (where it is used
 automatically), but also when creating exception messages.
 
+@attention For now, this functionality should only be used internally 
within
+LibreOffice. It may change again in a future version.
+
 @since LibreOffice 3.5
 */
 #define SAL_WHERE SAL_DETAIL_WHERE
@@ -166,6 +169,9 @@ inline char const * unwrapStream(StreamIgnore const &) {
 
   SAL_INFO("foo", "object: " << (hasName ? obj->name : SAL_STREAM(obj)));
 
+@attention For now, this functionality should only be used internally 
within
+LibreOffice. It may change again in a future version.
+
 @since LibreOffice 3.5
 */
 #define SAL_STREAM(stream) \
@@ -251,6 +257,9 @@ inline char const * unwrapStream(StreamIgnore const &) {
 change.  The log output is printed to stderr without further text encoding
 conversion.
 
+@attention For now, this functionality should only be used internally 
within
+LibreOffice. It may change again in a future version.
+
 @since LibreOffice 3.5
 */
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: np_sdk/StaticLibrary_nputils.mk

[Matus Kukan]

 np_sdk/StaticLibrary_nputils.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 842523e46f347680ad2648c628c63374524135cd
Author: Matúš Kukan 
Date:   Thu Jan 12 09:43:26 2012 +0100

np_sdk: add missing dependency

diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index b0c9764..ff63293 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
 
+$(eval $(call gb_StaticLibrary_add_package_headers,nputils,np_sdk_inc))
+
 $(eval $(call gb_StaticLibrary_use_externals,nputils,\
mozilla_headers \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configmgr/source

[Stephan Bergmann]

 configmgr/source/xcuparser.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit ab93e1b483d7af9bcac997e838e5a62a924e28c3
Author: Stephan Bergmann 
Date:   Thu Jan 12 09:15:19 2012 +0100

Check for xcu  that should rather be .

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 6ee5c82..2d65923 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -934,6 +934,16 @@ void XcuParser::handleGroupNode(
 state_.push(State(true)); // ignored
 return;
 }
+Node::Kind kind = child->kind();
+if (kind != Node::KIND_GROUP && kind != Node::KIND_SET) {
+throw css::uno::RuntimeException(
+(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad  \"")) +
+ name +
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("\" of non group/set kind in ")) +
+ reader.getUrl()),
+css::uno::Reference< css::uno::XInterface >());
+}
 if (op != OPERATION_MODIFY && op != OPERATION_FUSE) {
 throw css::uno::RuntimeException(
 (rtl::OUString(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits