from:"Caolán McNamara"

[Libreoffice-commits] .: binfilter/bf_starmath

2012-05-24 Thread Caolán McNamara

 binfilter/bf_starmath/source/starmath_parse.cxx |2 -
 binfilter/bf_starmath/source/starmath_smmod.cxx |   34 
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 55dbc98f225d5b2c695b3d724a1fff0e9c5e9873
Author: CaolÃ¡n McNamara 
Date:   Thu May 24 07:37:00 2012 +0100

convert ResStringArray to rtl::OUString

Change-Id: I32d51ad09e1a190d92d6e6f6c14d9f9debf7bf41

diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx 
b/binfilter/bf_starmath/source/starmath_parse.cxx
index 30f763c..2146f11 100644
--- a/binfilter/bf_starmath/source/starmath_parse.cxx
+++ b/binfilter/bf_starmath/source/starmath_parse.cxx
@@ -2216,7 +2216,7 @@ const sal_Int32 coNumContFlags =
 /*M*/ USHORT nCount = pFrom->Count();
 /*M*/ for (USHORT i = 0;  i < nCount;  ++i)
 /*M*/ {
-/*M*/ if (pFrom->GetString(i) == rName)
+/*M*/ if (pFrom->GetString(i).equals(rName))
 /*M*/ {
 /*M*/ aNewName = pTo->GetString(i);
 /*M*/ bReplace = TRUE;
diff --git a/binfilter/bf_starmath/source/starmath_smmod.cxx 
b/binfilter/bf_starmath/source/starmath_smmod.cxx
index 3c1dd5e..0b6656c 100644
--- a/binfilter/bf_starmath/source/starmath_smmod.cxx
+++ b/binfilter/bf_starmath/source/starmath_smmod.cxx
@@ -76,10 +76,10 @@ namespace binfilter {
 /*N*/ const ResStringArray &rExportNames = 
rData.GetExportSymbolNamesArray();
 /*N*/ USHORT nCount = rExportNames.Count();
 /*N*/ for (USHORT i = 0;  i < nCount  &&  !aRes.Len();  ++i)
-/*N*/   {
-/*N*/ if (rExportName == rExportNames.GetString(i))
+/*N*/ {
+/*N*/   if (rExportNames.GetString(i).equals(rExportName))
 /*N*/   {
-/*N*/ aRes = rUiNames.GetString(i);
+/*N*/   aRes = rUiNames.GetString(i);
 /*N*/   break;
 /*N*/   }
 /*N*/   }
@@ -90,43 +90,43 @@ namespace binfilter {
 
 /*N*/ const String SmLocalizedSymbolData::GetExportSymbolName( const String 
&rUiName ) const
 /*N*/ {
-/*N*/   String aRes;
+/*N*/ String aRes;
 /*N*/
 /*N*/ const SmLocalizedSymbolData &rData = SM_MOD1()->GetLocSymbolData();
 /*N*/ const ResStringArray &rUiNames = rData.GetUiSymbolNamesArray();
 /*N*/ const ResStringArray &rExportNames = 
rData.GetExportSymbolNamesArray();
-/*N*/   USHORT nCount = rUiNames.Count();
+/*N*/ USHORT nCount = rUiNames.Count();
 /*N*/ for (USHORT i = 0;  i < nCount  &&  !aRes.Len();  ++i)
-/*N*/   {
-/*N*/ if (rUiName == rUiNames.GetString(i))
-/*N*/   {
+/*N*/ {
+/*N*/ if (rUiNames.GetString(i).equals(rUiName))
+/*N*/ {
 /*N*/   aRes = rExportNames.GetString(i);
 /*N*/   break;
-/*N*/   }
-/*N*/   }
+/*N*/ }
+/*N*/ }
 /*N*/
-/*N*/   return aRes;
+/*N*/ return aRes;
 /*N*/ }
 
 
 /*N*/ const String SmLocalizedSymbolData::GetUiSymbolSetName( const String 
&rExportName ) const
 /*N*/ {
-/*N*/   String aRes;
+/*N*/ String aRes;
 /*N*/
 /*N*/ const SmLocalizedSymbolData &rData = SM_MOD1()->GetLocSymbolData();
 /*N*/ const ResStringArray &rUiNames = rData.GetUiSymbolSetNamesArray();
 /*N*/ const ResStringArray &rExportNames = 
rData.GetExportSymbolSetNamesArray();
 /*N*/ USHORT nCount = rExportNames.Count();
 /*N*/ for (USHORT i = 0;  i < nCount  &&  !aRes.Len();  ++i)
-/*N*/   {
-/*N*/ if (rExportName == rExportNames.GetString(i))
+/*N*/ {
+/*N*/   if (rExportNames.GetString(i).equals(rExportName))
 /*N*/   {
-/*N*/ aRes = rUiNames.GetString(i);
+/*N*/   aRes = rUiNames.GetString(i);
 /*N*/   break;
 /*N*/   }
-/*N*/   }
+/*N*/ }
 /*N*/
-/*N*/   return aRes;
+/*N*/ return aRes;
 /*N*/ }
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sc

2012-05-16 Thread Caolán McNamara

 binfilter/bf_sc/source/core/tool/sc_interpr1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49f2a0aed4b0549222cf32ef903a0507aac01893
Author: CaolÃ¡n McNamara 
Date:   Wed May 16 13:52:12 2012 +0100

WaE: fVal may be used uninitialized

Change-Id: Ifee8b1f44868813cc7d1c02539517e8d2bf0675d

diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx 
b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 8cccb61..82032bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1561,7 +1561,7 @@ short ScInterpreter::IsEven()
 {
 nFuncFmtType = NUMBERFORMAT_LOGICAL;
 short nRes = 0;
-double fVal;
+double fVal = 0;
 switch ( GetStackType() )
 {
 case svDoubleRef :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/pt_PT

2012-05-08 Thread Caolán McNamara

 dictionaries/pt_PT/dictionaries.xcu |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fbc3fc5d119592f1f1c302e7faada12f5a77891d
Author: CaolÃ¡n McNamara 
Date:   Tue May 8 10:32:42 2012 +0100

use pt-PT dictionaries for pt-AO as well

Change-Id: I8cee2552e9b7582fea7ec9a599560a041d702e31

diff --git a/dictionaries/pt_PT/dictionaries.xcu 
b/dictionaries/pt_PT/dictionaries.xcu
index 3e11f76..0722884 100644
--- a/dictionaries/pt_PT/dictionaries.xcu
+++ b/dictionaries/pt_PT/dictionaries.xcu
@@ -10,7 +10,7 @@
 DICT_SPELL
 
 
-pt-PT
+pt-PT pt-AO
 
 
 
@@ -22,7 +22,7 @@
 DICT_HYPH
 
 
-pt-PT
+pt-PT pt-AO
 
 
 
@@ -34,7 +34,7 @@
 DICT_THES
 
 
-pt-PT
+pt-PT pt-AO
 
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/inc

2012-05-03 Thread Caolán McNamara

 binfilter/inc/bf_svtools/svdde.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit b85701cac464778e0717773da342450648151e97
Author: CaolÃ¡n McNamara 
Date:   Thu May 3 18:00:18 2012 +0100

Revert "Remove unused parts"

This reverts commit 1a0db504b60623eeb45d64a8ce8d1463983f6c2a.

They seem to be built under windows and the windows build-bots
are complaining.

diff --git a/binfilter/inc/bf_svtools/svdde.hxx 
b/binfilter/inc/bf_svtools/svdde.hxx
index f9aa33a..e74f360 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -55,6 +55,8 @@ struct DdeDataImp;
 struct DdeImp;
 
 DECLARE_LIST( DdeConnections, DdeConnection* )
+DECLARE_LIST( DdeTransactions, DdeTransaction* )
+DECLARE_LIST( DdeFormats, long )
 
 #ifdef WNT
 class DdeService;
@@ -234,6 +236,7 @@ class  DdeConnection
 {
 friend classDdeInternal;
 friend classDdeTransaction;
+DdeTransactions aTransactions;
 DdeString*  pService;
 DdeString*  pTopic;
 DdeImp* pImp;
@@ -394,6 +397,7 @@ protected:
 const DdeTopic* GetSysTopic() const { return pSysTopic; }
 private:
 DdeTopics   aTopics;
+DdeFormats  aFormats;
 DdeTopic*   pSysTopic;
 DdeString*  pName;
 ConvList*   pConv;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: toolkit/inc toolkit/source unusedcode.easy

2012-04-24 Thread Caolán McNamara

 toolkit/inc/toolkit/controls/unocontrolmodel.hxx |   11 ++-
 toolkit/source/controls/unocontrolmodel.cxx  |   12 
 unusedcode.easy  |1 -
 3 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit d8f145d1ebe8836f559ba47a1978063d922c6294
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 16:21:16 2012 +0100

save the next guy from getting caught with msvc template requirements

diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx 
b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 99722b7..e0d6aa8 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -109,7 +109,16 @@ protected:
 ) const;
 
 protected:
-UnoControlModel();
+UnoControlModel() //do not use! needed by MSVC at compile time to satisfy 
WeakAggImplHelper7
+: UnoControlModel_Base()
+, MutexAndBroadcastHelper()
+, OPropertySetHelper( BrdcstHelper )
+, maDisposeListeners( *this )
+, maContext( ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >() )
+{
+assert(false);
+}
+
 public:
 UnoControlModel( const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& i_factory );
 UnoControlModel( const UnoControlModel& rModel );
diff --git a/toolkit/source/controls/unocontrolmodel.cxx 
b/toolkit/source/controls/unocontrolmodel.cxx
index 2d0a2fd..9b24903 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -122,18 +122,6 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& 
rFD, sal_uInt16 nPropId,
 //  
 //  class UnoControlModel
 //  
-UnoControlModel::UnoControlModel()
-:UnoControlModel_Base()
-,MutexAndBroadcastHelper()
-,OPropertySetHelper( BrdcstHelper )
-,maDisposeListeners( *this )
-,maContext( ::comphelper::getProcessServiceFactory() )
-{
-OSL_ENSURE( false, "UnoControlModel::UnoControlModel: not implemented. 
Well, not really." );
-// just implemented to let the various FooImplInheritanceHelper compile, 
you should use the
-// version taking a service factory
-}
-
 UnoControlModel::UnoControlModel( const Reference< XMultiServiceFactory >& 
i_factory )
 :UnoControlModel_Base()
 ,MutexAndBroadcastHelper()
diff --git a/unusedcode.easy b/unusedcode.easy
index d1f5e1d..938fcd7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -261,7 +261,6 @@ TempFile::IsValid() const
 TextEngine::GetLeftMargin() const
 TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor 
const&, com::sun::star::uno::Reference&)
 TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
-UnoControlModel::UnoControlModel()
 VCLUnoHelper::CreatePointer()
 VCLXPrinterServer::getImplementationId()
 VCLXPrinterServer::getTypes()
___
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

2012-04-24 Thread Caolán McNamara

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5304afbdb07997678638ec2f340f0e09801706b6
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 18:54:39 2012 +0100

need to adapt for older api

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 02afdc0..ff81727 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -554,9 +554,9 @@ rtl_TextEncoding lcl_getDefaultTextEncoding()
 
 const OUString& rLanguage = 
Application::GetSettings().GetLocale().Language;
 
-if (rLanguage == "ru" || rLanguage == "uk")
+if (rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ru")) || 
rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("uk")))
 return RTL_TEXTENCODING_MS_1251;
-if (rLanguage == "tr")
+if (rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("tr")))
 return RTL_TEXTENCODING_MS_1254;
 else
 return RTL_TEXTENCODING_MS_1252;
___
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

2012-04-24 Thread Caolán McNamara

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit c5282a72180ab7747c923cdc2b1988d15d3956b1
Author: Miklos Vajna 
Date:   Sat Apr 21 11:25:18 2012 +0200

fdo#48023 fix RTF import of Russian characters without an encoding specified

lcl_GetDefaultTextEncodingForRTF() in editeng did the same.

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aca6a29..02afdc0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -549,13 +549,26 @@ sal_uInt32 RTFDocumentImpl::getColorTable(sal_uInt32 
nIndex)
 return 0;
 }
 
+rtl_TextEncoding lcl_getDefaultTextEncoding()
+{
+
+const OUString& rLanguage = 
Application::GetSettings().GetLocale().Language;
+
+if (rLanguage == "ru" || rLanguage == "uk")
+return RTL_TEXTENCODING_MS_1251;
+if (rLanguage == "tr")
+return RTL_TEXTENCODING_MS_1254;
+else
+return RTL_TEXTENCODING_MS_1252;
+}
+
 rtl_TextEncoding RTFDocumentImpl::getEncoding(sal_uInt32 nFontIndex)
 {
 if (!m_pSuperstream)
 {
 if (nFontIndex < m_aFontEncodings.size())
 return m_aFontEncodings[nFontIndex];
-return 0;
+return lcl_getDefaultTextEncoding();
 }
 else
 return m_pSuperstream->getEncoding(nFontIndex);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source toolkit/inc toolkit/source unusedcode.easy

2012-04-24 Thread Caolán McNamara

 editeng/inc/editeng/editeng.hxx |4 ++--
 editeng/inc/editeng/editobj.hxx |4 ++--
 editeng/source/editeng/editattr.hxx |4 ++--
 editeng/source/editeng/editeng.cxx  |4 ++--
 editeng/source/editeng/editobj.cxx  |8 
 editeng/source/editeng/editobj2.hxx |   17 +++--
 editeng/source/editeng/impedit.hxx  |6 +++---
 editeng/source/editeng/impedit3.cxx |6 +++---
 toolkit/inc/toolkit/controls/unocontrolbase.hxx |6 --
 toolkit/source/controls/unocontrolbase.cxx  |8 
 unusedcode.easy |1 -
 11 files changed, 29 insertions(+), 39 deletions(-)

New commits:
commit b856ea5af5282b8790a0edd6aa3a6de5f54c3ba6
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 16:07:24 2012 +0100

inline unused ctor needed by MSVC at compile time

diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx 
b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
index 34779cc..d5e19ea 100644
--- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
@@ -40,8 +40,10 @@
 class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
 {
 protected:
-UnoControlBase();
-
+UnoControlBase() //do not use! needed by MSVC at compile time to satisfy 
AggImplInheritanceHelper5
+{
+assert(false);
+}
 protected:
 UnoControlBase( const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& i_factory )
 :UnoControl( i_factory )
commit 6ac292332620737bfe522166f88994097d1a5460
Author: Xavi Escriche Galindo 
Date:   Tue Apr 24 16:06:00 2012 +0100

Remove unused method UnoControlBase::UnoControlBase()

diff --git a/toolkit/source/controls/unocontrolbase.cxx 
b/toolkit/source/controls/unocontrolbase.cxx
index dc95dec..1de8849 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -39,14 +39,6 @@
 //  class UnoControlBase
 //  
 
-UnoControlBase::UnoControlBase()
-:UnoControl( ::comphelper::getProcessServiceFactory() )
-{
-OSL_ENSURE( false, "UnoControlBase::UnoControlBase: not implemented. Well, 
not really." );
-// just implemented to let the various FooImplInheritanceHelper compile, 
you should use the
-// version taking a service factory
-}
-
 sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId )
 {
 ::rtl::OUString aPropName( GetPropertyName( nPropId ) );
diff --git a/unusedcode.easy b/unusedcode.easy
index b4fd869..d1f5e1d 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -261,7 +261,6 @@ TempFile::IsValid() const
 TextEngine::GetLeftMargin() const
 TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor 
const&, com::sun::star::uno::Reference&)
 TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
-UnoControlBase::UnoControlBase()
 UnoControlModel::UnoControlModel()
 VCLUnoHelper::CreatePointer()
 VCLXPrinterServer::getImplementationId()
commit 070dfe4840cfb5854be6aba99dd65b9015ed0a90
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 15:46:11 2012 +0100

WaE: mixing comparison of bool and sal_Bool

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index f2208a9..8b23f00 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -223,8 +223,8 @@ public:
 voidSetPaperSize( const Size& rSize );
 const Size& GetPaperSize() const;
 
-voidSetVertical( sal_Bool bVertical );
-sal_BoolIsVertical() const;
+voidSetVertical( bool bVertical );
+boolIsVertical() const;
 
 voidSetFixedCellHeight( sal_Bool bUseFixedCellHeight );
 
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index b495efb..c57a70b 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -72,8 +72,8 @@ public:
 virtual sal_uLong   GetObjectSettings() const;
 virtual voidSetObjectSettings( sal_uLong n );
 
-virtual sal_BoolIsVertical() const;
-virtual voidSetVertical( sal_Bool bVertical );
+virtual boolIsVertical() const;
+virtual voidSetVertical( bool bVertical );
 
 virtual sal_uInt16  GetScriptType() const;
 
diff --git a/editeng/source/editeng/editattr.hxx 
b/editeng/source/editeng/editattr.hxx
index 1a371d0..d2cdb42 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -107,10 +107,10 @@ public:
 { return ( ( nStart <= nIndex ) && ( nEnd >= nIndex ) ); }
 sal_BoolIsInside( sal_uInt16 nIndex ) const
 { return ( ( nStart < nIndex ) && ( nEnd > nIndex ) ); }
-sal_BoolIsEmpty() const
+boolIsEmpty() const
 { return nStart == nEnd; }

[Libreoffice-commits] .: basic/source

2012-04-24 Thread Caolán McNamara

 basic/source/comp/scanner.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc069413e54ae9626298f337b180dd4f142f4776
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 15:39:51 2012 +0100

WaE: return SYMBOL -> return true

has been return SYMBOL since initial checkin in 2000,
SYMBOL is a non-0 enum so return true here instead

diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index a664e57..6f7f0bd 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -419,7 +419,7 @@ bool SbiScanner::NextSym()
 // treated as an operator
 --pLine; --nCol; nCol1 = nCol-1;
 aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&"));
-return SYMBOL;
+return true;
 }
 bNumber = true;
 long l = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmlhelp/source

2012-04-24 Thread Caolán McNamara

 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 41135b6dd86200d125095749e044d593a0452c41
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 14:24:09 2012 +0100

WaE: silence warnings from msvc2008 (again)

diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx 
b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index ca333ea..6134030 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -34,8 +34,18 @@
 #include 
 
 #include 
+
+#if defined _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4068 4263 4264 4266)
+#endif
+
 #include 
 
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include 
 
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2012-04-24 Thread Caolán McNamara

 vcl/unx/generic/app/salinst.cxx |3 --
 vcl/unx/gtk/app/gtkinst.cxx |   54 +++-
 2 files changed, 43 insertions(+), 14 deletions(-)

New commits:
commit 658954e8b50fc264428402dc5a95b0d6f690d191
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 12:03:27 2012 +0100

Resolves: fdo#48011 writer idle-callbacks are halting when events pending

Writer does a lot of work, e.g. spell-checking, word counting etc. in
idle-callbacks. It halts work by checking for AnyInput, and if any input or
paint etc is pending the idle-callbacks stop. With gtk3 rework pending
events don't seem to be available quite right.

diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 9bf80c4..cb11406 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -147,9 +147,8 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType)
 Display *pDisplay  = pData->GetSalDisplay()->GetDisplay();
 sal_Bool bRet = sal_False;
 
-if( (nType & VCL_INPUT_TIMER) && mpXLib->CheckTimeout( false ) )
+if( (nType & VCL_INPUT_TIMER) && (mpXLib && mpXLib->CheckTimeout(false)) )
 bRet = sal_True;
-
 else if (XPending(pDisplay) )
 {
 PredicateReturn aInput;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 8cc92da..c78de14 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -27,6 +27,7 @@
  /
 
 
+#include 
 #include 
 #include 
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -264,12 +265,11 @@ extern "C" {
 return GDK_FILTER_CONTINUE;
 }
 
-// And then again as they pop out of gdk and into gtk+
-
-static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+static sal_uInt16 categorizeEvent(const GdkEvent *pEvent)
 {
 sal_uInt16 nType = 0;
-switch( pEvent->type ) {
+switch( pEvent->type )
+{
 case GDK_MOTION_NOTIFY:
 case GDK_BUTTON_PRESS:
 case GDK_2BUTTON_PRESS:
@@ -291,8 +291,16 @@ extern "C" {
 nType = VCL_INPUT_OTHER;
 break;
 }
-((GtkInstance *)data)->subtractEvent( nType );
+return nType;
+}
 
+
+// And then again as they pop out of gdk and into gtk+
+
+static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+{
+sal_uInt16 nType = categorizeEvent(pEvent);
+((GtkInstance *)data)->subtractEvent( nType );
 gtk_main_do_event( pEvent );
 }
 }
@@ -623,16 +631,38 @@ bool GtkInstance::AnyInput( sal_uInt16 nType )
 {
 if( (nType & VCL_INPUT_TIMER) && IsTimerExpired() )
 return true;
-else
+#if !GTK_CHECK_VERSION(3,0,0)
+bool bRet = X11SalInstance::AnyInput(nType);
+#else
+if (!gdk_events_pending())
+return false;
+
+if (nType == VCL_INPUT_ANY)
+return true;
+
+bool bRet = false;
+std::stack aEvents;
+GdkEvent *pEvent = NULL;
+while ((pEvent = gdk_event_get()))
 {
-bool bRet = false;
-sal_uInt16 nShift = 1;
-for (int i = 0; i < 16; i++) {
-bRet |= (nType & nShift) && m_nAnyInput[i] > 0;
-nShift <<= 1;
+aEvents.push(pEvent);
+sal_uInt16 nEventType = categorizeEvent(pEvent);
+if ( (nEventType & nType) || ( ! nEventType && (nType & 
VCL_INPUT_OTHER) ) )
+{
+bRet = true;
+break;
 }
-return bRet;
 }
+
+while (!aEvents.empty())
+{
+pEvent = aEvents.top();
+gdk_event_put(pEvent);
+gdk_event_free(pEvent);
+aEvents.pop();
+}
+#endif
+return bRet;
 }
 
 GenPspGraphics *GtkInstance::CreatePrintGraphics()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - cppuhelper/source store/source

2012-04-24 Thread Caolán McNamara

 cppuhelper/source/defaultbootstrap.cxx |2 +-
 store/source/makefile.mk   |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f5a414d242f3b3bce19de4905d7b5dce9792b66c
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 10:41:58 2012 +0100

WaE: simple minded MSVC2008 thinks s could be used uninitialized

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index f156ce1..f948586 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1370,7 +1370,7 @@ rtl::OUString ServiceManager::readLegacyRdbString(
 {
 RegistryKey subkey;
 RegValueType t;
-sal_uInt32 s;
+sal_uInt32 s(0);
 if (key.openKey(path, subkey) != REG_NO_ERROR
 || subkey.getValueInfo(rtl::OUString(), &t, &s) != REG_NO_ERROR
 || t != RG_VALUETYPE_STRING
commit a0d6c5dd9bf359d8428f26701acb6b2036b4417c
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 24 10:21:48 2012 +0100

WaE: MSVC2008 C4530 exception handler without unwind semantics

diff --git a/store/source/makefile.mk b/store/source/makefile.mk
index c7ae53d..4263a57 100644
--- a/store/source/makefile.mk
+++ b/store/source/makefile.mk
@@ -29,6 +29,7 @@ PRJ=..
 
 PRJNAME=store
 TARGET=store
+ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings ---
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-04-24 Thread Caolán McNamara

 sw/source/ui/inc/unotxvw.hxx |4 ++--
 sw/source/ui/uno/unotxvw.cxx |   29 ++---
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 8533a191f4434490aa44118bce0e5719477d957a
Author: Noel Grandin 
Date:   Wed Apr 18 18:03:53 2012 +0200

Convert SV_DECL_PTRARR_DEL to boost::ptr_vector

diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 5655b6c..c764c15 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -55,8 +55,8 @@
 class SdrObject;
 class SwView;
 
-typedef ::com::sun::star::uno::Reference< 
::com::sun::star::view::XSelectionChangeListener > * 
XSelectionChangeListenerPtr;
-SV_DECL_PTRARR_DEL( SelectionChangeListenerArr, XSelectionChangeListenerPtr, 4 
)
+typedef ::com::sun::star::uno::Reference< 
::com::sun::star::view::XSelectionChangeListener > XSelectionChangeListenerRef;
+typedef boost::ptr_vector 
SelectionChangeListenerArr;
 
 class SwXTextView :
 public ::com::sun::star::view::XSelectionSupplier,
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index d96a47e..3cd93ac 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -97,8 +97,6 @@ using comphelper::HelperBaseNoState;
 
 using ::rtl::OUString;
 
-SV_IMPL_PTRARR( SelectionChangeListenerArr, XSelectionChangeListenerPtr );
-
 SwPaM* lcl_createPamCopy(const SwPaM& rPam)
 {
 SwPaM *const pRet = new SwPaM(*rPam.GetPoint());
@@ -141,23 +139,23 @@ void SwXTextView::Invalidate()
 
 m_refCount++; //prevent second d'tor call
 
-sal_uInt16 nCount = aSelChangedListeners.Count();
+sal_uInt16 nCount = aSelChangedListeners.size();
 if(nCount)
 {
 uno::Reference< uno::XInterface >  xInt = 
(cppu::OWeakObject*)(SfxBaseController*)this;
 lang::EventObject aEvent(xInt);
 for ( sal_uInt16 i = nCount; i--; )
 {
-uno::Reference< view::XSelectionChangeListener >  *pObj = 
aSelChangedListeners[i];
+uno::Reference< view::XSelectionChangeListener >  *pObj = 
&aSelChangedListeners[i];
 (*pObj)->disposing(aEvent);
 }
 }
 
 // #i85580: now clean up any possibly remaining entries in the array...
 // (i.e. listeners that did not call removeSelectionChangeListener in 
their disposing.)
-while ((nCount = aSelChangedListeners.Count()) != 0)
+while ((nCount = aSelChangedListeners.size()) != 0)
 {
-removeSelectionChangeListener( *aSelChangedListeners[0] );
+removeSelectionChangeListener( aSelChangedListeners[0] );
 }
 
 m_refCount--;
@@ -610,7 +608,7 @@ void SwXTextView::addSelectionChangeListener(
 SolarMutexGuard aGuard;
 uno::Reference< view::XSelectionChangeListener > * pInsert = new 
uno::Reference< view::XSelectionChangeListener > ;
 *pInsert = rxListener;
-aSelChangedListeners.Insert(pInsert, aSelChangedListeners.Count());
+aSelChangedListeners.push_back(pInsert);
 }
 
 void SwXTextView::removeSelectionChangeListener(
@@ -619,13 +617,14 @@ void SwXTextView::removeSelectionChangeListener(
 {
 SolarMutexGuard aGuard;
 view::XSelectionChangeListener* pLeft = rxListener.get();
-for(sal_uInt16 i = 0; i < aSelChangedListeners.Count(); i++)
+for(SelectionChangeListenerArr::iterator it = aSelChangedListeners.begin();
+it != aSelChangedListeners.end(); ++it)
 {
-uno::Reference< view::XSelectionChangeListener > * pElem = 
aSelChangedListeners.GetObject(i);
- view::XSelectionChangeListener* pRight = pElem->get();
+uno::Reference< view::XSelectionChangeListener > * pElem = &*it;
+view::XSelectionChangeListener* pRight = pElem->get();
 if(pLeft == pRight)
 {
-aSelChangedListeners.Remove(i);
+aSelChangedListeners.erase(it);
 delete pElem;
 break;
 }
@@ -885,10 +884,10 @@ void SwXTextView::NotifySelChanged()
 
  lang::EventObject aEvent(xInt);
 
-sal_uInt16 nCount = aSelChangedListeners.Count();
+sal_uInt16 nCount = aSelChangedListeners.size();
 for ( sal_uInt16 i = nCount; i--; )
 {
-uno::Reference< view::XSelectionChangeListener >  *pObj = 
aSelChangedListeners[i];
+uno::Reference< view::XSelectionChangeListener >  *pObj = 
&aSelChangedListeners[i];
 (*pObj)->selectionChanged(aEvent);
 }
 }
@@ -898,10 +897,10 @@ void SwXTextView::NotifyDBChanged()
 URL aURL;
 aURL.Complete = 
rtl::OUString::createFromAscii(SwXDispatch::GetDBChangeURL());
 
-sal_uInt16 nCount = aSelChangedListeners.Count();
+sal_uInt16 nCount = aSelChangedListeners.size();
 for ( sal_uInt16 i = nCount; i--; )
 {
-uno::Reference< view::XSelectionChangeListener >  *pObj = 
aSelChangedListeners[i];
+uno::Reference< view::XSelectionChangeListener >  *pObj = 
&aSelChangedListeners[i];
 uno::Reference xDispatch((*pObj), UNO_QUERY);
 if(xDispatch.is())
 xDisp

[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - ooo.lst.in openssl/makefile.mk openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/op

2012-04-24 Thread Caolán McNamara

 ooo.lst.in  |2 +-
 openssl/makefile.mk |   16 
 openssl/openssl.patch   |   24 
 openssl/opensslios.patch|4 ++--
 openssl/openssllnx.patch|   28 ++--
 openssl/opensslmacosx.patch |   12 ++--
 openssl/opensslmingw.patch  |   16 
 openssl/opensslsol.patch|   28 ++--
 openssl/version.mk  |4 ++--
 9 files changed, 67 insertions(+), 67 deletions(-)

New commits:
commit 9d646e9e331ca23853ec04d044ae8c1ea42346e3
Author: Petr Mladek 
Date:   Mon Apr 23 10:37:37 2012 +0200

update internal openssl to version 0.9.8v

including important bug fixes

Signed-off-by: Fridrich Strba 
(cherry picked from commit 696bd00021e3e959ed8b4854611799cda96f187d)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/ooo.lst.in b/ooo.lst.in
index 0e493e2..408e0ee 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -1,6 +1,6 @@
 http://dev-www.libreoffice.org/src
 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
-63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
+51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
 db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2
 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
 e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index f537838..eb4f455 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -46,10 +46,10 @@ TARGET=openssl
 @echo "openssl disabled"
 .ENDIF
 
-OPENSSL_NAME=openssl-0.9.8o
+OPENSSL_NAME=openssl-0.9.8v
 
 TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
+TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
@@ -75,8 +75,8 @@ UNAME=$(shell uname)
 .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID"
 PATCH_FILES=openssllnx.patch
 ADDITIONAL_FILES:= \
-libcrypto_OOo_0_9_8o.map \
-libssl_OOo_0_9_8o.map
+libcrypto_OOo_0_9_8v.map \
+libssl_OOo_0_9_8v.map
 .IF "$(CPU)" == "I"
 .IF "$(UNAME)" == "GNU/kFreeBSD"
 CONFIGURE_ACTION=Configure debian-kfreebsd-i386
@@ -93,15 +93,15 @@ UNAME=$(shell uname)
 CONFIGURE_ACTION=Configure linux-generic32
 .ENDIF
 # if you build openssl as shared library you have to patch the 
Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
-#BUILD_ACTION=make 
'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
+#BUILD_ACTION=make 
'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map'
 .ENDIF
 
 .IF "$(OS)" == "SOLARIS"
 PATCH_FILES=opensslsol.patch
 ADDITIONAL_FILES:= \
-libcrypto_OOo_0_9_8o.map \
-libssl_OOo_0_9_8o.map
-#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text 
-M./lib(SHLIBDIRS)_OOo_0_9_8e.map'
+libcrypto_OOo_0_9_8v.map \
+libssl_OOo_0_9_8v.map
+#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text 
-M./lib(SHLIBDIRS)_OOo_0_9_8v.map'
 
 # Use BUILD64 when 1 to select new specific 64bit Configurations if 
necessary
 
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 88f7088..538b2c1 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,5 +1,5 @@
 misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 
+0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c   2010-03-26 
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 
+0100
 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c   2010-03-26 
12:04:20.961547300 +0100
 @@ -2,7 +2,7 @@
  /* Contributed to the OpenSSL Project 2004
   * by Richard Levitte (rich...@levitte.org)
@@ -9,8 +9,8 @@
   * (Royal Institute of Technology, Stockholm, Sweden).
   * All rights reserved.
   *
 misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c2004-12-28 
01:21:33.0 +0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c  2010-03-26 
12:04:20.961547300 +0100
+--- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 
01:21:33.0 +0100
 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c  2010-03-26 
12:04:20.961547300 +0100
 @@ -2,7 +2,7 @@
  /* Contributed to the OpenSSL Project 2004
   * by Richard Levitte (rich...@levitte.org)
@@ -20,8 +20,8 @@
   * (Royal Institute of Technology, Stockholm, Sweden).
   * All rights reserved.
   *
 misc/openssl-0.9.8o/ms/do_ms.bat   2009-07-28 14:51:19.0 +0200
-+++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 
+0100
+--- misc/openssl-0.9.8v/ms/do_ms.bat   2009-07-28 14:51:19.0 +0200
 misc/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300 
+0100
 @@ -1,11 +1,11 @@
  
 -perl util\mkfiles.pl >MINFO
@@ -43,8 +43,8 @@
 -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
 +%1 util\mkdef.pl 32 libeay > ms\libeay32.def
 +%

[Libreoffice-commits] .: 2 commits - editeng/source sc/inc sc/source unusedcode.easy

2012-04-24 Thread Caolán McNamara

 editeng/source/editeng/editdoc.cxx |5 -
 editeng/source/editeng/editdoc.hxx |1 -
 sc/inc/chartlis.hxx|2 --
 sc/source/core/tool/chartlis.cxx   |   15 ---
 unusedcode.easy|2 --
 5 files changed, 25 deletions(-)

New commits:
commit 93a6aeb965c2d77767178e62475378f69b326414
Author: Santiago Martinez 
Date:   Mon Apr 23 19:37:15 2012 +0200

Remove unused code in sc.

diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 3a92519..2c7a0b7 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -88,8 +88,6 @@ private:
 
 public:
 ScChartListener( const rtl::OUString& rName, ScDocument* pDoc,
- const ScRange& rRange );
-ScChartListener( const rtl::OUString& rName, ScDocument* pDoc,
  const ScRangeListRef& rRangeListRef );
 ScChartListener( const rtl::OUString& rName, ScDocument* pDoc,
  ::std::vector* pTokens );
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 79da0c9..c655eba 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -120,21 +120,6 @@ boost::unordered_set& 
ScChartListener::ExternalRefListener::getAllFi
 // 
 
 ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* 
pDocP,
-const ScRange& rRange ) :
-SvtListener(),
-mpExtRefListener(NULL),
-mpTokens(new vector),
-maName(rName),
-pUnoData( NULL ),
-pDoc( pDocP ),
-bUsed( false ),
-bDirty( false ),
-bSeriesRangesScheduled( false )
-{
-SetRangeList( rRange );
-}
-
-ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* 
pDocP,
 const ScRangeListRef& rRangeList ) :
 SvtListener(),
 mpExtRefListener(NULL),
diff --git a/unusedcode.easy b/unusedcode.easy
index e10c47b..b4fd869 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -35,7 +35,6 @@ ScAddInDocs::Insert(ScAddInDocs const*, unsigned short, 
unsigned short)
 ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
 ScAddInDocs::Insert(ScDocument* const*, unsigned short)
 ScAddInDocs::Remove(ScDocument* const&, unsigned short)
-ScChartListener::ScChartListener(rtl::OUString const&, ScDocument*, ScRange 
const&)
 ScChartListener::SetName(rtl::OUString const&)
 ScCompressedArray::GetEntryCount() const
 ScCompressedArray::CopyFrom(ScCompressedArray const&, int, int, long)
commit 444e47bfdd8df18f8e37d0271dc1d48e55cc9c12
Author: Vicent Vendrell 
Date:   Mon Apr 23 16:43:30 2012 +0200

Removed unused code from editeng

Committer:Vicent Vendrell 

On branch master

modified:   editeng/source/editeng/editdoc.cxx
modified:   editeng/source/editeng/editdoc.hxx
modified:   unusedcode.easy

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 23549a7..110daf5 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2711,11 +2711,6 @@ size_t CharAttribList::Count() const
 return aAttribs.size();
 }
 
-void CharAttribList::Clear()
-{
-aAttribs.clear();
-}
-
 const EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, 
sal_uInt16 nPos ) const
 {
 // Backwards, if one ends where the next starts.
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index 531652c..8dfe4f6 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -236,7 +236,6 @@ public:
 voidOptimizeRanges( SfxItemPool& rItemPool );
 
 size_t Count() const;
-void Clear();
 
 voidInsertAttrib( EditCharAttrib* pAttrib );
 
diff --git a/unusedcode.easy b/unusedcode.easy
index e1cd14b..e10c47b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,4 @@
 
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence, com::sun::star::uno::Sequence, unsigned char)
-CharAttribList::Clear()
 Dialog::Dialog(Window*, ResId const&)
 EditEngine::GetNextVisPortion(ParaPortion const*) const
 FmFieldWinMgr::GetChildWindowId()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source unusedcode.easy

2012-04-24 Thread Caolán McNamara

 sw/source/ui/dbui/maildispatcher.cxx |8 
 sw/source/ui/inc/maildispatcher.hxx  |5 -
 unusedcode.easy  |1 -
 3 files changed, 14 deletions(-)

New commits:
commit 78aa62bc54e67b4552c18ae67be9789be5ef2409
Author: Santiago Martinez 
Date:   Tue Apr 24 08:52:28 2012 +0100

Remove unused code in sw

diff --git a/sw/source/ui/dbui/maildispatcher.cxx 
b/sw/source/ui/dbui/maildispatcher.cxx
index 5e0f9e5..3eb6632 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -208,14 +208,6 @@ void 
MailDispatcher::addListener(::rtl::Reference liste
 listeners_.push_back(listener);
 }
 
-void MailDispatcher::removeListener(::rtl::Reference 
listener)
-{
-OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down 
already");
-
-::osl::MutexGuard guard(listener_container_mutex_);
-listeners_.remove(listener);
-}
-
 std::list< ::rtl::Reference > 
MailDispatcher::cloneListener()
 {
 ::osl::MutexGuard guard(listener_container_mutex_);
diff --git a/sw/source/ui/inc/maildispatcher.hxx 
b/sw/source/ui/inc/maildispatcher.hxx
index ad5521d..d11d58f 100644
--- a/sw/source/ui/inc/maildispatcher.hxx
+++ b/sw/source/ui/inc/maildispatcher.hxx
@@ -136,11 +136,6 @@ public:
 */
 void addListener(::rtl::Reference listener);
 
-/**
-Unregister a listener for mail dispatcher events
-*/
-void removeListener(::rtl::Reference listener);
-
 protected:
 virtual void SAL_CALL run();
 virtual void SAL_CALL onTerminated();
diff --git a/unusedcode.easy b/unusedcode.easy
index a96ce89..e1cd14b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -22,7 +22,6 @@ MSDffImportRecords::Insert(SvxMSDffImportRec* const&, 
unsigned short&)
 MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
 MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
 MSDffImportRecords::Remove(unsigned short, unsigned short)
-MailDispatcher::removeListener(rtl::Reference)
 Matrix3d::Inverse() const
 Matrix3d::Matrix3d()
 PopupMenu::SetSelectedEntry(unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-24 Thread Caolán McNamara

 sc/inc/dpitemdata.hxx  |2 --
 sc/source/core/data/dpitemdata.cxx |9 -
 unusedcode.easy|2 --
 3 files changed, 13 deletions(-)

New commits:
commit 858646a5eb5eae8703cfb64cd1cdbc553699a224
Author: Santiago Martinez 
Date:   Mon Apr 23 19:24:37 2012 +0200

Remove unused code in dpitemdata.

diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 1996d68..46642a9 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -87,7 +87,6 @@ public:
 ScDPItemData();
 ScDPItemData(const ScDPItemData& r);
 ScDPItemData(const rtl::OUString& rStr);
-ScDPItemData(const rtl::OUString* pStr);
 ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue);
 ~ScDPItemData();
 
@@ -98,7 +97,6 @@ public:
 void SetRangeStart(double fVal);
 void SetRangeFirst();
 void SetRangeLast();
-void SetErrorString(const rtl::OUString& rS);
 void SetErrorString(const rtl::OUString* pS);
 bool IsCaseInsEqual(const ScDPItemData& r) const;
 
diff --git a/sc/source/core/data/dpitemdata.cxx 
b/sc/source/core/data/dpitemdata.cxx
index 83ca357..1bcc3a6 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -121,9 +121,6 @@ void ScDPItemData::DisposeString()
 ScDPItemData::ScDPItemData(const rtl::OUString& rStr) :
 mpString(new rtl::OUString(rStr)), meType(String), mbStringInterned(false) 
{}
 
-ScDPItemData::ScDPItemData(const rtl::OUString* pStr) :
-mpString(pStr), meType(String), mbStringInterned(true) {}
-
 ScDPItemData::ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue) :
 meType(GroupValue), mbStringInterned(false)
 {
@@ -184,12 +181,6 @@ void ScDPItemData::SetRangeLast()
 meType = RangeStart;
 }
 
-void ScDPItemData::SetErrorString(const rtl::OUString& rS)
-{
-SetString(rS);
-meType = Error;
-}
-
 void ScDPItemData::SetErrorString(const rtl::OUString* pS)
 {
 SetString(pS);
diff --git a/unusedcode.easy b/unusedcode.easy
index 046ba9a..a96ce89 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -56,8 +56,6 @@ ScConditionalFormats_Impl::Remove(unsigned short, unsigned 
short)
 ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
 
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator > >, 
std::__debug::vector > >, ScDBData>)
 ScDBCollection::AnonDBs::findByTable(short) const
-ScDPItemData::ScDPItemData(rtl::OUString const*)
-ScDPItemData::SetErrorString(rtl::OUString const&)
 ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
 ScDPObject::HasGroups() const
 ScDocRowHeightUpdater::TabRanges::TabRanges()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-23 Thread Caolán McNamara

 svx/inc/svx/sdr/animation/scheduler.hxx   |3 -
 svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx  |1 
 svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx |2 -
 svx/source/sdr/animation/scheduler.cxx|7 
 svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx   |   22 --
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx  |8 -
 unusedcode.easy   |3 -
 7 files changed, 46 deletions(-)

New commits:
commit 9be39efcc55f9c4a8f7c02bdded299c0ef7e54fd
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 23 23:12:46 2012 +0100

callcatcher: fix up isControlVisible

diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx 
b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index ac9259f..fb3ad54 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -829,6 +829,11 @@ namespace sdr { namespace contact {
 */
 boolimpl_isDisposed_nofail() const { return m_pAntiImpl == NULL; }
 
+/** determines whether our control is currently visible
+@nofail
+*/
+boolimpl_isControlVisible_nofail() const { return 
m_bControlIsVisible; }
+
 /** determines whether we are currently a listener at the control for 
desgin-mode relevant facets
 @nofail
 */
@@ -1714,14 +1719,6 @@ namespace sdr { namespace contact {
 }
 
 //
-bool ViewObjectContactOfUnoControl::isControlVisible() const
-{
-SolarMutexGuard aSolarGuard;
-const ControlHolder& rControl( m_pImpl->getExistentControl() );
-return rControl.is() && rControl.isVisible();
-}
-
-//
 Reference< XControl > ViewObjectContactOfUnoControl::getControl()
 {
 SolarMutexGuard aSolarGuard;
commit 00fb6c9d1c0ad01b29fb617dbe74e6ae1ddf04ce
Author: Vicente Rafael Estevez Vacas 
Date:   Sun Apr 22 11:39:31 2012 +0200

PATCH: Remove unused code from editing

diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx 
b/svx/inc/svx/sdr/animation/scheduler.hxx
index 61bcaf6..be2fa36 100644
--- a/svx/inc/svx/sdr/animation/scheduler.hxx
+++ b/svx/inc/svx/sdr/animation/scheduler.hxx
@@ -133,9 +133,6 @@ namespace sdr
 // #i38135#
 void SetTime(sal_uInt32 nTime);
 
-// reset
-void Reset(sal_uInt32 nTime);
-
 // execute all ripe events, removes executed ones from the 
scheduler
 void triggerEvents();
 
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx 
b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 5a3de11..483ea83 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -62,7 +62,6 @@ namespace sdr
 return (SdrMediaObj&)GetSdrObject();
 }
 
-boolhasPreferredSize() const;
 SizegetPreferredSize() const;
 
 voidupdateMediaItem( ::avmedia::MediaItem& rItem ) const;
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx 
b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index b52fa26..2addaf1 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -64,8 +64,6 @@ namespace sdr { namespace contact {
 
 public:
 ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, 
ViewContactOfUnoControl& _rViewContact );
-/// determines whether an XControl already exists, and is currently 
visible
-boolisControlVisible() const;
 
 /// returns the ->XControl instance belonging to the instance, creates 
it if necessary
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
diff --git a/svx/source/sdr/animation/scheduler.cxx 
b/svx/source/sdr/animation/scheduler.cxx
index b3c7491..a05194c 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -274,13 +274,6 @@ namespace sdr
 }
 }
 
-void Scheduler::Reset(sal_uInt32 nTime)
-{
-mnTime = nTime;
-mnDeltaTime = 0L;
-maList.Clear();
-}
-
 void Scheduler::InsertEvent(Event* pNew)
 {
 if(pNew)
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index 6568169..4b6eb22 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -58,28 +58,6 @@ ViewObjectContact& 
ViewContactOfSdrMediaObj::CreateObjectSpecificViewObjectConta
 
 // 
---

[Libreoffice-commits] .: vcl/source

2012-04-23 Thread Caolán McNamara

 vcl/source/gdi/pngread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f5be85719985ce54ff65b88aaa420ed5b2e7a9b
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 23 20:35:40 2012 +0100

cut out negative widths/heights early

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 81b9280..a7cf7ec 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -472,7 +472,7 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size& 
rPreviewSizeHint )
 maOrigSize.Width()  = ImplReadsal_uInt32();
 maOrigSize.Height() = ImplReadsal_uInt32();
 
-if ( !maOrigSize.Width() || !maOrigSize.Height() )
+if (maOrigSize.Width() <= 0 || maOrigSize.Height() <= 0)
 return sal_False;
 
 mnPngDepth = *(maDataIter++);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-21 Thread Caolán McNamara

 extensions/source/nsplugin/source/npshell.cxx |   10 --
 extensions/source/scanner/sane.cxx|   26 +-
 2 files changed, 29 insertions(+), 7 deletions(-)

New commits:
commit e37ae322b07a02714b22cb663e1d7ab4f2072730
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 21 22:24:03 2012 +0100

fill in some sane defaults on read/write failure

diff --git a/extensions/source/nsplugin/source/npshell.cxx 
b/extensions/source/nsplugin/source/npshell.cxx
index f6b4ea4..33c282f 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -761,7 +761,7 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const 
char* fname)
 return;
 }
 char buffer[NPP_BUFFER_SIZE] = {0};
-int ret;
+ssize_t ret;
 while(0 <= (ret = read(fdSrc, buffer, NPP_BUFFER_SIZE)))
 {
 if (0 == ret)
@@ -773,8 +773,10 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const 
char* fname)
 break;
 }
 ssize_t written_bytes = write(fdDst, buffer, ret);
-if (written_bytes == -1)
+if (written_bytes != ret)
 {
+debug_fprintf(NSP_LOG_APPEND, "NPP_StreamAsFile:short write to 
%s. error: %s \n",
+localPathNew, strerror(errno));
 return;
 }
 }
diff --git a/extensions/source/scanner/sane.cxx 
b/extensions/source/scanner/sane.cxx
index ca2cec1..b89f9bd 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -526,21 +526,20 @@ static inline sal_uInt8 _ReadValue( FILE* fp, int depth )
 // as we do
 size_t items_read = fread( &nWord, 1, 2, fp );
 
-// fread() does not distinguish between end-of-file and error, and 
callers
-//   must use feof(3) and ferror(3) to determine which occurred.
-if (items_read == 0)
+if (items_read != 2)
 {
- // nothing todo?
- // WaE is happy!
+ SAL_WARN( "extensions.scanner", "short read, abandoning" );
+ return 0;
 }
+
 return (sal_uInt8)( nWord / 256 );
 }
 sal_uInt8 nByte;
 size_t items_read = fread( &nByte, 1, 1, fp );
-if (items_read == 0)
+if (items_read != 1)
 {
- // nothing todo?
- // WaE is happy!
+SAL_WARN( "extensions.scanner", "short read, abandoning" );
+return 0;
 }
 return nByte;
 }
@@ -819,22 +818,18 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
 aConverter.Seek( 1084 );
 }
 
-for( nLine = nHeight-1;
- nLine >= 0; nLine-- )
+for (nLine = nHeight-1; nLine >= 0; --nLine)
 {
 fseek( pFrame, nLine * aParams.bytes_per_line, SEEK_SET );
 if( eType == FrameStyle_BW ||
 ( eType == FrameStyle_Gray && aParams.depth == 8 )
 )
 {
-size_t items_read = fread( pBuffer, 1, 
aParams.bytes_per_line, pFrame );
-
-// fread() does not distinguish between end-of-file and 
error, and callers
-//   must use feof(3) and ferror(3) to determine which 
occurred.
-if (items_read == 0)
+SANE_Int items_read = fread( pBuffer, 1, 
aParams.bytes_per_line, pFrame );
+if (items_read != aParams.bytes_per_line)
 {
-// nothing todo?
-// WaE is happy!
+SAL_WARN( "extensions.scanner", "short read, padding 
with zeros" );
+memset(pBuffer + items_read, 0, aParams.bytes_per_line 
- items_read);
 }
 aConverter.Write( pBuffer, aParams.bytes_per_line );
 }
commit 6ef852f160b88b2052c150374fb9aeab43a29804
Author: David Ostrovsky 
Date:   Sat Apr 21 14:29:14 2012 +0200

WaE: extensions warnings fixed

diff --git a/extensions/source/nsplugin/source/npshell.cxx 
b/extensions/source/nsplugin/source/npshell.cxx
index 81ce8fb..f6b4ea4 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -772,7 +772,11 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const 
char* fname)
 
 break;
 }
-write(fdDst, buffer, ret);
+ssize_t written_bytes = write(fdDst, buffer, ret);
+if (written_bytes == -1)
+{
+return;
+}
 }
 close(fdSrc);
 close(fdDst);
diff --git a/extensions/source/scanner/sane.cxx 
b/extensions/source/scanner/sane.cxx
index aaefbf4..ca2cec1 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -524,11 +524,24 @@ static inline sal_uInt8 _

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

2012-04-21 Thread Caolán McNamara

 crashrep/source/unx/main.cxx |   33 ++---
 1 file changed, 10 insertions(+), 23 deletions(-)

New commits:
commit 461b786be77a2116673915d56e1bf875cac792b5
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 21 21:42:18 2012 +0100

make comment reflect reality

diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index d4c17bd..493c21f 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -1032,38 +1032,17 @@ static bool setup_version()
 return 0 != g_strReportServer.length();
 }
 
-#if 0
-// Use gconftool-2 to determine if gnome accessiblity is enabled
-// unused
-static bool get_accessibility_state()
-{
-bool bAccessible = false;
-FILE *fin = popen( "gconftool-2 -g 
/desktop/gnome/interface/accessibility", "r");
-
-if ( fin )
-{
-char buffer[sizeof("true")];
-
-bAccessible = fgets( buffer, sizeof(buffer), fin ) && 0 == strcmp( 
buffer, "true" );
-
-pclose( fin );
-}
-
-return bAccessible;
-}
-#endif
-
 int main( int argc, char** argv )
 {
 FILE *fin = freopen( "/dev/null", "w", stderr );
-if (!fin) 
+if (!fin)
 {
 return -1;
 }
 
 setup_program_dir( argv[0] );
 
-// Don't start if accessiblity is enabled or report server is not given
+// Don't start if report server is not given
 
 if ( setup_version() )
 {
commit ad4f72560627a2d75c71a34f2a37ab1f5a2bf05d
Author: David Ostrovsky 
Date:   Sat Apr 21 14:27:43 2012 +0200

WaE: crashrep warnings fixed

diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index f9a6320..d4c17bd 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -592,7 +592,11 @@ static void setup_program_dir( const char* progname )
 
 g_strProgramDir = aDir.substr( 0, pos + 1 );
 aDir.erase( pos );
-chdir( aDir.c_str() );
+int ret = chdir( aDir.c_str() );
+if (!ret)
+{
+return;
+}
 }
 }
 
@@ -1051,7 +1055,11 @@ static bool get_accessibility_state()
 
 int main( int argc, char** argv )
 {
-freopen( "/dev/null", "w", stderr );
+FILE *fin = freopen( "/dev/null", "w", stderr );
+if (!fin) 
+{
+return -1;
+}
 
 setup_program_dir( argv[0] );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-21 Thread Caolán McNamara

 sdext/source/pdfimport/tree/pdfiprocessor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc0c85e8628bf90afd4a47c20b3d1bc2a9c01b36
Author: Korrawit Pruegsanusak 
Date:   Sat Apr 21 10:06:19 2012 +0700

Fix fdo#45848

regression from 5dd4f9ecb2f50cf76b44472e4438297b6c65184c
The change:
-if(m_GlyphsList.size()>1)
+if(!m_GlyphsList.empty())
is incorrect, so change it back.
(cherry picked from commit bcb4defef7c9147a94ef19a51a18715449d3572d)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 6d0e34e..a800643 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -399,7 +399,7 @@ void PDFIProcessor::processGlyphLine()
 
 }
 
-if(!m_GlyphsList.empty())
+if(m_GlyphsList.size()>1)
  processGlyph( 0,
   m_GlyphsList[m_GlyphsList.size()-1],
   pPara,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2012-04-21 Thread Caolán McNamara

 sdext/source/pdfimport/tree/pdfiprocessor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcb4defef7c9147a94ef19a51a18715449d3572d
Author: Korrawit Pruegsanusak 
Date:   Sat Apr 21 10:06:19 2012 +0700

Fix fdo#45848

regression from 5dd4f9ecb2f50cf76b44472e4438297b6c65184c
The change:
-if(m_GlyphsList.size()>1)
+if(!m_GlyphsList.empty())
is incorrect, so change it back.

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index d0ec397..12d2ab4 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -399,7 +399,7 @@ void PDFIProcessor::processGlyphLine()
 
 }
 
-if(!m_GlyphsList.empty())
+if(m_GlyphsList.size()>1)
  processGlyph( 0,
   m_GlyphsList[m_GlyphsList.size()-1],
   pPara,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - linguistic/source sc/inc sc/source unusedcode.easy

2012-04-21 Thread Caolán McNamara

 linguistic/source/lngprophelp.cxx |1 +
 sc/inc/cell.hxx   |1 -
 sc/source/core/data/cell.cxx  |5 -
 unusedcode.easy   |1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit d2bfa5cfdaaa68a3e2bd751cc45955e4ea41f36b
Author: Szabolcs Dezsi 
Date:   Sat Apr 21 15:28:50 2012 +0200

Resolves: fdo#3: Changing spelling preferences requires application 
restart

diff --git a/linguistic/source/lngprophelp.cxx 
b/linguistic/source/lngprophelp.cxx
index b93971f..82a7c4d 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -522,6 +522,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const 
PropertyValues &rPropVals )
 nResMaxNumberOfSuggestions  = GetDefaultNumberOfSuggestions();
 bResIsSpellWithDigits   = bIsSpellWithDigits;
 bResIsSpellCapitalization   = bIsSpellCapitalization;
+bResIsSpellUpperCase= bIsSpellUpperCase;
 
 sal_Int32 nLen = rPropVals.getLength();
 if (nLen)
commit dd2230c90ff41b667bf0d750801eb0d2ab3b0317
Author: Ferran Vidal 
Date:   Sat Apr 21 18:08:11 2012 +0200

Remove unused code from "Spreadsheet application code"

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 08fbdfa..b4549d1 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -207,7 +207,6 @@ public:
 DECL_FIXEDMEMPOOL_NEWDEL( ScStringCell )
 #endif
 
-ScStringCell();
 explicitScStringCell(const rtl::OUString& rString);
 
 #if OSL_DEBUG_LEVEL > 0
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 9ccadde..a4e5361 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -657,11 +657,6 @@ ScValueCell::~ScValueCell()
 
 // 
 
-ScStringCell::ScStringCell() :
-ScBaseCell( CELLTYPE_STRING )
-{
-}
-
 ScStringCell::ScStringCell( const rtl::OUString& rString ) :
 ScBaseCell( CELLTYPE_STRING ),
 maString( rString.intern() )
diff --git a/unusedcode.easy b/unusedcode.easy
index 89aa3c8..b62d53a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -86,7 +86,6 @@ ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, 
unsigned char (*)(un
 ScRangeData::ReplaceRangeNamesInUse(std::__debug::map, std::allocator > > const&)
 ScRangeData::ScRangeData(unsigned short)
 ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
-ScStringCell::ScStringCell()
 ScTable::ReplaceRangeNamesInUse(short, int, short, int, 
std::__debug::map, 
std::allocator > > const&)
 ScTypedStrData::GetValue() const
 ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-21 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par.hxx  |4 -
 sw/source/filter/ww8/ww8par3.cxx |  112 +--
 2 files changed, 52 insertions(+), 64 deletions(-)

New commits:
commit 2457f8f5b88028d0248943e2f80fce55913312f1
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 21 14:54:15 2012 +0100

clarify DelNumRule comment

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index f909f77..357119b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1411,9 +1411,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, 
SwWW8ImplReader& rReader_)
 WW8ListManager::~WW8ListManager()
 {
 /*
-named lists remain in doc!!!
-unnamed lists are deleted when unused
-pLFOInfos are in any case destructed
+ named lists remain in document
+ unused automatic lists are removed from document (DelNumRule)
 */
 for(std::vector::iterator aIter = maLSTInfos.begin();
 aIter != maLSTInfos.end(); ++aIter)
@@ -1426,18 +1425,18 @@ WW8ListManager::~WW8ListManager()
 delete *aIter;
 }
 boost::ptr_vector::reverse_iterator aIter;
-for (aIter = pLFOInfos.rbegin() ;
-aIter < pLFOInfos.rend();
-++aIter )
+for (aIter = pLFOInfos.rbegin() ;
+aIter < pLFOInfos.rend();
+++aIter )
+{
+if (aIter->bOverride
+&& aIter->pNumRule
+&& !aIter->bUsedInDoc
+&& aIter->pNumRule->IsAutoRule())
 {
-if (aIter->bOverride
-&& aIter->pNumRule
-&& !aIter->bUsedInDoc
-&& aIter->pNumRule->IsAutoRule())
-{
-rDoc.DelNumRule( aIter->pNumRule->GetName() );
-}
+rDoc.DelNumRule( aIter->pNumRule->GetName() );
 }
+}
 }
 
 bool IsEqualFormatting(const SwNumRule &rOne, const SwNumRule &rTwo)
commit 1f98094fc61f39f349c7d6cd3f59a8c9cd0626fc
Author: Arnaud Versini 
Date:   Sat Apr 7 19:46:32 2012 +0200

Use boost::ptr_vector in WW8ListManager instead of SV_DECL_PTRARR_DEL

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index de9219d..e2cc680 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -142,8 +142,6 @@ namespace com{namespace sun {namespace star{
 //-
 
 struct WW8LFOInfo;
-typedef WW8LFOInfo* WW8LFOInfo_Ptr;
-SV_DECL_PTRARR_DEL(WW8LFOInfos,WW8LFOInfo_Ptr,16)
 
 class WW8Reader : public StgReader
 {
@@ -177,7 +175,7 @@ private:
 const WW8Fib&rFib;
 SvStream&rSt;
 std::vector maLSTInfos;
-WW8LFOInfos* pLFOInfos;// D. aus PLF LFO, sortiert genau wie im WW8 Stream
+boost::ptr_vector pLFOInfos;// D. aus PLF LFO, sortiert genau 
wie im WW8 Stream
 sal_uInt16   nUniqueList; // current number for creating unique list 
names
 sal_uInt8* GrpprlHasSprm(sal_uInt16 nId, sal_uInt8& rSprms, sal_uInt8 
nLen);
 WW8LSTInfo* GetLSTByListId(sal_uInt32  nIdLst ) const;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 4a39b5d..f909f77 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -457,7 +457,6 @@ WW8LFOInfo::WW8LFOInfo(const WW8LFO& rLFO)
 {
 }
 
-SV_IMPL_PTRARR( WW8LFOInfos, WW8LFOInfo_Ptr );
 
 
 // Hilfs-Methoden 
@@ -1052,7 +1051,7 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
 //
 WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
 : maSprmParser(rReader_.GetFib().GetFIBVersion()), rReader(rReader_),
-rDoc(rReader.GetDoc()), rFib(rReader.GetFib()), rSt(rSt_), pLFOInfos(0),
+rDoc(rReader.GetDoc()), rFib(rReader.GetFib()), rSt(rSt_),
 nUniqueList(1)
 {
 // LST und LFO gibts erst ab WW8
@@ -1062,7 +1061,6 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, 
SwWW8ImplReader& rReader_)
 || ( rFib.lcbPlfLfo < 2) ) return; // offensichtlich keine Listen 
da
 
 // Arrays anlegen
-pLFOInfos = new WW8LFOInfos;
 bool bLVLOk = true;
 
 nLastLFOPosition = USHRT_MAX;
@@ -1243,7 +1241,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, 
SwWW8ImplReader& rReader_)
 for (int i = 0; i < nMaxSize; ++i)
 pLFOInfo->maParaSprms[i] = pParentListInfo->maParaSprms[i];
 }
-pLFOInfos->Insert(pLFOInfo, pLFOInfos->Count());
+pLFOInfos.push_back(pLFOInfo);
 bOk = true;
 }
 
@@ -1252,23 +1250,21 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, 
SwWW8ImplReader& rReader_)
 //
 // 2.2 fuer alle LFO die zugehoerigen LFOLVL einlesen
 //
-sal_uInt16 nLFOInfos = pLFOInfos ? pLFOInfos->Count() : 0;
-for (sal_uInt16 nLfo = 0; nLfo < nLFOInfos; ++nLfo)
+size_t nLFOInfos = pLFOInfos.size();
+for (size_t nLfo = 0; nLfo < nLFOInfos; ++nLfo)
 {
 bOk = false;

[Libreoffice-commits] .: 2 commits - basic/inc basic/source toolkit/inc

2012-04-20 Thread Caolán McNamara

 basic/inc/basic/sbmod.hxx |6 +++---
 basic/source/classes/sbxmod.cxx   |6 --
 toolkit/inc/toolkit/helper/macros.hxx |2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b2fdaed46509127ec3ac2fb87404bc1b51d8
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 20 20:01:54 2012 +0100

WaE: MSVC2008 C2220 unsafe mix of types in operation

diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 24700e9..392082b 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -73,7 +73,7 @@ protected:
 SbiImage*   pImage;// the Image
 SbiBreakpoints* pBreaks;   // Breakpoints
 SbClassData*pClassData;
-sal_Bool mbVBACompat;
+bool mbVBACompat;
 sal_Int32 mnType;
 SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
 boolbIsProxyModule;
@@ -139,8 +139,8 @@ public:
 sal_Bool ExceedsLegacyModuleSize();
 void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
 bool HasExeCode();
-sal_Bool IsVBACompat() const;
-void SetVBACompat( sal_Bool bCompat );
+bool IsVBACompat() const;
+void SetVBACompat( bool bCompat );
 sal_Int32 GetModuleType() { return mnType; }
 void SetModuleType( sal_Int32 nType ) { mnType = nType; }
 bool isProxyModule() { return bIsProxyModule; }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 9d3a4b9..87928cf 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1077,15 +1077,17 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
 if( ((StarBASIC*)p) != pBasic )
 ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
 }
-sal_Bool SbModule::IsVBACompat() const
+
+bool SbModule::IsVBACompat() const
 {
 return mbVBACompat;
 }
 
-void SbModule::SetVBACompat( sal_Bool bCompat )
+void SbModule::SetVBACompat( bool bCompat )
 {
 mbVBACompat = bCompat;
 }
+
 // Run a Basic-subprogram
 sal_uInt16 SbModule::Run( SbMethod* pMeth )
 {
commit 6f9971f3b935f669b39d7a53266950ee92955027
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 20 15:16:43 2012 +0100

WaE: MSVC20082 unreferenced argument

diff --git a/toolkit/inc/toolkit/helper/macros.hxx 
b/toolkit/inc/toolkit/helper/macros.hxx
index b2acbf2..3d59e60 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/toolkit/inc/toolkit/helper/macros.hxx
@@ -176,7 +176,7 @@ void ClassName::disposing( const 
::com::sun::star::lang::EventObject& ) throw(::
 sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), 
RTL_TEXTENCODING_ASCII_US ); \
 OSL_FAIL( sMessage.getStr() );
 #else
-#define DISPLAY_EXCEPTION( ClassName, MethodName, e )
+#define DISPLAY_EXCEPTION( ClassName, MethodName, e ) (void)e;
 #endif
 
 #define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_2PARAM( ClassName, 
InterfaceName, MethodName, ParamType1, ParamType2 ) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: test/source

2012-04-20 Thread Caolán McNamara

 test/source/sheet/xdatabaserange.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 6a018dec6b1abe75464bd510d441ab56d7291e1f
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 20 13:47:32 2012 +0100

WaE: MSVC2008 C2220 unsafe mix of types in operation

diff --git a/test/source/sheet/xdatabaserange.cxx 
b/test/source/sheet/xdatabaserange.cxx
index 381e892..7715305 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -91,15 +91,15 @@ void XDatabaseRange::testGetSortDescriptor()
 
 if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSortColumns")))
 {
-sal_Bool bIsSortColumns = true;
+sal_Bool bIsSortColumns = sal_True;
 xProp.Value >>= bIsSortColumns;
-CPPUNIT_ASSERT(bIsSortColumns == true);
+CPPUNIT_ASSERT(bIsSortColumns == sal_True);
 }
 else if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContainsHeader")))
 {
-sal_Bool bContainsHeader = true;
+sal_Bool bContainsHeader = sal_True;
 xProp.Value >>= bContainsHeader;
-CPPUNIT_ASSERT(bContainsHeader == true);
+CPPUNIT_ASSERT(bContainsHeader == sal_True);
 }
 else if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxFieldCount")))
 {
@@ -114,15 +114,15 @@ void XDatabaseRange::testGetSortDescriptor()
 }
 else if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BindFormatsToContent")))
 {
-sal_Bool bBindFormatsToContent = false;
+sal_Bool bBindFormatsToContent = sal_False;
 xProp.Value >>= bBindFormatsToContent;
-CPPUNIT_ASSERT(bBindFormatsToContent == true);
+CPPUNIT_ASSERT(bBindFormatsToContent == sal_False);
 }
 else if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyOutputData")))
 {
-sal_Bool bCopyOutputData = true;
+sal_Bool bCopyOutputData = sal_True;
 xProp.Value >>= bCopyOutputData;
-CPPUNIT_ASSERT(bCopyOutputData == false);
+CPPUNIT_ASSERT(bCopyOutputData == sal_False);
 }
 else if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputPosition")))
 {
@@ -130,9 +130,9 @@ void XDatabaseRange::testGetSortDescriptor()
 }
 else if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUserListEnabled")))
 {
-sal_Bool bIsUserListEnabled  = true;
+sal_Bool bIsUserListEnabled  = sal_True;
 xProp.Value >>= bIsUserListEnabled;
-CPPUNIT_ASSERT(bIsUserListEnabled == false);
+CPPUNIT_ASSERT(bIsUserListEnabled == sal_False);
 
 }
 else if (xProp.Name == 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserListIndex")))
@@ -180,7 +180,7 @@ void XDatabaseRange::testRefresh()
 uno::Reference< beans::XPropertySet > xPropRow(xRow, UNO_QUERY_THROW);
 Any aAny = xPropRow->getPropertyValue( aHidden );
 
-CPPUNIT_ASSERT( aAny.get() == true);
+CPPUNIT_ASSERT(aAny.get() == sal_True);
 }
 
 xDBRange->refresh();
@@ -194,7 +194,7 @@ void XDatabaseRange::testRefresh()
 uno::Reference< beans::XPropertySet > xPropRow(xRow, UNO_QUERY_THROW);
 Any aAny = xPropRow->getPropertyValue( aHidden );
 
-CPPUNIT_ASSERT( aAny.get() == false);
+CPPUNIT_ASSERT(aAny.get() == sal_False);
 }
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - drawinglayer/source sw/source

2012-04-20 Thread Caolán McNamara

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |   22 +
 sw/source/core/layout/paintfrm.cxx|  185 --
 2 files changed, 180 insertions(+), 27 deletions(-)

New commits:
commit e435a78af84f04e1ea8907c70447a87841aa1186
Author: Michael Stahl 
Date:   Mon Apr 16 16:12:36 2012 +0200

fdo#38215: merge consecutive border lines:

This re-implements the merging that was done by SwLineRects::AddLineRect,
SwLineRect::MakeUnion with the drawing layer border lines.
This is used to merge borders of paragraphs and of tables that have the
"separating" border-model, which fixes both the tiny dividing gaps
between successive borders in the second bugdoc and the weird subtly
differently rendered successive borders in the first bugdoc.
(regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2)

(cherry-picked from 0868a0155a2b57daf7b862d120aead0458372b17
 and 44092833d3a0f0d6074c64bd0e64bbdf11109afe)

Conflicts:

sw/source/core/layout/paintfrm.cxx

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 1fd7013..797f3af 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -132,6 +132,9 @@
 
 using namespace ::editeng;
 using namespace ::com::sun::star;
+using ::drawinglayer::primitive2d::BorderLinePrimitive2D;
+using ::std::pair;
+using ::std::make_pair;
 
 #define GETOBJSHELL()   ((SfxObjectShell*)rSh.GetDoc()->GetDocShell())
 
@@ -223,19 +226,21 @@ public:
 
 class BorderLines
 {
-::comphelper::SequenceAsVector<
- ::drawinglayer::primitive2d::Primitive2DReference> m_Lines;
+typedef ::comphelper::SequenceAsVector<
+::rtl::Reference > Lines_t;
+Lines_t m_Lines;
 public:
-void AddBorderLine(
-::drawinglayer::primitive2d::Primitive2DReference const& xLine)
-{
-m_Lines.push_back(xLine);
-}
+void AddBorderLine(::rtl::Reference const& xLine);
 drawinglayer::primitive2d::Primitive2DSequence GetBorderLines_Clear()
 {
 ::comphelper::SequenceAsVector<
 ::drawinglayer::primitive2d::Primitive2DReference> lines;
-::std::swap(m_Lines, lines);
+for (Lines_t::const_iterator it = m_Lines.begin(); it != m_Lines.end();
+++it)
+{
+lines.push_back(it->get());
+}
+m_Lines.clear();
 return lines.getAsConstList();
 }
 };
@@ -442,6 +447,121 @@ SwSavePaintStatics::~SwSavePaintStatics()
 
 SV_IMPL_VARARR( SwLRects, SwLineRect );
 
+static pair >
+lcl_TryMergeLines(pair const mergeA,
+  pair const mergeB)
+{
+double const fMergeGap(nPixelSzW + nHalfPixelSzW); // NOT static!
+if (   (mergeA.second + fMergeGap >= mergeB.first )
+&& (mergeA.first  - fMergeGap <= mergeB.second))
+{
+return make_pair(true, make_pair(
+std::min(mergeA.first, mergeB.first),
+std::max(mergeA.second, mergeB.second)));
+}
+return make_pair(false, make_pair(0, 0));
+}
+
+static ::rtl::Reference
+lcl_MergeBorderLines(
+BorderLinePrimitive2D const& rLine, BorderLinePrimitive2D const& rOther,
+basegfx::B2DPoint const& rStart, basegfx::B2DPoint const& rEnd)
+{
+return new BorderLinePrimitive2D(rStart, rEnd,
+rLine.getLeftWidth(),
+rLine.getDistance(),
+rLine.getRightWidth(),
+rLine.getExtendLeftStart(),
+rOther.getExtendLeftEnd(),
+rLine.getExtendRightStart(),
+rOther.getExtendRightEnd(),
+rLine.getRGBColorLeft(),
+rLine.getRGBColorGap(),
+rLine.getRGBColorRight(),
+rLine.hasGapColor(),
+rLine.getStyle());
+}
+
+static ::rtl::Reference
+lcl_TryMergeBorderLine(BorderLinePrimitive2D const& rThis,
+   BorderLinePrimitive2D const& rOther)
+{
+assert(rThis.getEnd().getX() >= rThis.getStart().getX());
+assert(rThis.getEnd().getY() >= rThis.getStart().getY());
+assert(rOther.getEnd().getX() >= rOther.getStart().getX());
+assert(rOther.getEnd().getY() >= rOther.getStart().getY());
+double thisHeight = rThis.getEnd().getY() - rThis.getStart().getY();
+double thisWidth  = rThis.getEnd().getX() - rThis.getStart().getX();
+double otherHeight = rOther.getEnd().getY() -  rOther.getStart().getY();
+double otherWidth  = rOther.getEnd().getX() -  rOther.getStart().getX();
+// check for same orientation, same line width and matching colors
+if (((thisHeight > thisWidth) == (otherHeight > otherWidth))
+&&  (rThis.getLeftWidth() == rOther.getLeftWidth())
+&&  (rThis.getDistance()  == rOther.getDistance())
+&&  (rThis.getRightWidth()== rOther.getRightWidth())
+&&  (rThis.getRGBColorLe

[Libreoffice-commits] .: 8 commits - filter/source l10ntools/inc l10ntools/prj l10ntools/source linguistic/source svtools/source unusedcode.easy

2012-04-20 Thread Caolán McNamara

 filter/source/graphicfilter/itiff/ccidecom.cxx |   35 
 filter/source/graphicfilter/itiff/itiff.cxx|   17 +---
 l10ntools/inc/l10ntools/HelpIndexer.hxx|4 -
 l10ntools/inc/l10ntools/HelpSearch.hxx |6 --
 l10ntools/inc/l10ntools/LuceneHelper.hxx   |   53 +
 l10ntools/prj/d.lst|1 
 l10ntools/source/help/HelpIndexer.cxx  |2 
 l10ntools/source/help/HelpSearch.cxx   |1 
 l10ntools/source/help/LuceneHelper.cxx |2 
 l10ntools/source/help/LuceneHelper.hxx |   44 
 linguistic/source/hyphdsp.cxx  |4 -
 svtools/source/control/calendar.cxx|8 +--
 svtools/source/control/ruler.cxx   |3 -
 svtools/source/control/valueacc.cxx|9 ++--
 unusedcode.easy|   10 
 15 files changed, 99 insertions(+), 100 deletions(-)

New commits:
commit 1dcab66d5c2579c4637891859736b02745fdf8bb
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 20 11:54:28 2012 +0100

WaE: MSVC2008 suppress warnings in clucene headers

diff --git a/l10ntools/inc/l10ntools/LuceneHelper.hxx 
b/l10ntools/inc/l10ntools/LuceneHelper.hxx
new file mode 100644
index 000..c990647
--- /dev/null
+++ b/l10ntools/inc/l10ntools/LuceneHelper.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Gert van Valkenhoef 
+ *  (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.
+ */
+
+#ifndef LUCENEHELPER_HXX
+#define LUCENEHELPER_HXX
+
+#if defined _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4068 4263 4264 4266)
+#endif
+
+#include 
+#include 
+
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+#include 
+#include 
+
+std::vector OUStringToTCHARVec(rtl::OUString const &rStr);
+rtl::OUString TCHARArrayToOUString(TCHAR const *str);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 959ab4d0ca1a09dce08a298e41828c377a1474ff
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 20 11:54:01 2012 +0100

WaE: MSVC2008 suppress warnings in clucene headers

diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx 
b/l10ntools/inc/l10ntools/HelpIndexer.hxx
index 28c7eb6..df492bb 100644
--- a/l10ntools/inc/l10ntools/HelpIndexer.hxx
+++ b/l10ntools/inc/l10ntools/HelpIndexer.hxx
@@ -31,9 +31,7 @@
 #define HELPINDEXER_HXX
 
 #include 
-
-#include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/l10ntools/inc/l10ntools/HelpSearch.hxx 
b/l10ntools/inc/l10ntools/HelpSearch.hxx
index 63e2807..1a1b3c0 100644
--- a/l10ntools/inc/l10ntools/HelpSearch.hxx
+++ b/l10ntools/inc/l10ntools/HelpSearch.hxx
@@ -31,14 +31,12 @@
 #define HELPSEARCH_HXX
 
 #include 
-
-#include 
-#include 
+#include 
 
 #include 
 #include 
 
-class L10N_DLLPUBLIC HelpSearch {
+class L10N_DLLPUBLIC HelpSearch{
private:
rtl::OUString d_lang;
rtl::OString d_indexDir;
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index e9329dc..99aac56 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -47,6 +47,7 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
 ..\inc\l10ntools\dllapi.h %_DEST%\inc\l10ntools\dllapi.h
 ..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
 ..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.hxx
+..\inc\l10ntools\LuceneHelper.hxx %_DEST%\inc\l10ntools\LuceneHelper.hxx
 ..\inc\l10ntools\HelpIndexer.hxx %_DEST%\inc\l10ntools\HelpIndexer.hxx
 ..\inc\l10ntools\HelpSearch.hxx %_DEST%\inc\l10ntools\HelpSearch.hxx
 ..\source\filter\merge\FCFGMerge.cfg  %_DEST%\inc\l10ntools\FCFGMerge.cfg
diff --git a/l10ntools/source/help/HelpIndexer.cxx 
b/l10ntools/source/help/HelpIndexer.cxx
index 3413464..608c6cb 100644
--- a/l10ntools/source/help/HelpIndexer.cxx
+++ b/l10ntools/source/help/HelpIndexer.cxx
@@ -28,8 +28,6 @@
  */
 
 #include 
-#include "LuceneHelper.hxx"
-#include 
 
 #include 
 #include 
diff

[Libreoffice-commits] .: 2 commits - i18npool/inc i18npool/source vcl/source

2012-04-19 Thread Caolán McNamara

 i18npool/inc/transliterationImpl.hxx|9 -
 i18npool/source/transliteration/transliterationImpl.cxx |   17 --
 vcl/source/gdi/pngread.cxx  |   27 +++-
 3 files changed, 33 insertions(+), 20 deletions(-)

New commits:
commit 791687613a66c13ee9f5f12b9859bc4ed0eff67e
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 21:16:25 2012 +0100

remove static objects from static_initialization_and_destruction chain

diff --git a/i18npool/inc/transliterationImpl.hxx 
b/i18npool/inc/transliterationImpl.hxx
index 94fba96..cb06d0e 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -126,15 +126,6 @@ private:
 com::sun::star::uno::Reference< XLocaleData > localedata;
 com::sun::star::uno::Reference< 
com::sun::star::i18n::XExtendedTransliteration > caseignore;
 
-/** structure to cache the last transliteration body used. */
-struct TransBody
-{
-::osl::Mutex mutex;
-::rtl::OUString Name;
-::com::sun::star::uno::Reference< 
::com::sun::star::i18n::XExtendedTransliteration > Body;
-};
-static TransBody lastTransBody;
-
 virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName,
 
com::sun::star::uno::Reference 
& body, const com::sun::star::lang::Locale& rLocale)
 throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx 
b/i18npool/source/transliteration/transliterationImpl.cxx
index 5e9f621..009f6e3 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -34,6 +34,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -143,8 +144,6 @@ static struct TMlist {
   {(TransliterationModules)0, (TransliterationModulesNew)0,  NULL}
 };
 
-TransliterationImpl::TransBody TransliterationImpl::lastTransBody;
-
 // Constructor/Destructor
 TransliterationImpl::TransliterationImpl(const Reference 
& xMSF) : xSMgr(xMSF)
 {
@@ -587,11 +586,23 @@ TransliterationImpl::clear()
 caseignoreOnly = sal_True;
 }
 
+namespace
+{
+/** structure to cache the last transliteration body used. */
+struct TransBody
+{
+::rtl::OUString Name;
+::com::sun::star::uno::Reference< 
::com::sun::star::i18n::XExtendedTransliteration > Body;
+};
+class theTransBodyMutex : public rtl::Static {};
+}
+
 void TransliterationImpl::loadBody( OUString &implName, 
Reference& body )
 throw (RuntimeException)
 {
 assert(!implName.isEmpty());
-::osl::MutexGuard guard(lastTransBody.mutex);
+::osl::MutexGuard guard(theTransBodyMutex::get());
+static TransBody lastTransBody;
 if (implName != lastTransBody.Name)
 {
 lastTransBody.Body.set(
commit 88e0fa4aa3bea9ffeee372b6a428ca62cee41203
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 20:46:59 2012 +0100

fail earlier on oversized images

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index d279c01..81b9280 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -613,14 +613,6 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size& 
rPreviewSizeHint )
 
 mnScansize = static_cast< sal_uInt32 >( nScansize64 );
 
-// TODO: switch between both scanlines instead of copying
-mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
-mpScanCurrent = mpInflateInBuf;
-mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
-
-if ( !mpInflateInBuf || !mpScanPrior )
-return sal_False;
-
 // calculate target size from original size and the preview hint
 if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() )
 {
@@ -655,6 +647,25 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size& 
rPreviewSizeHint )
 maTargetSize.Width()  = (maOrigSize.Width() + mnPreviewMask) >> 
mnPreviewShift;
 maTargetSize.Height() = (maOrigSize.Height() + mnPreviewMask) >> 
mnPreviewShift;
 
+//round bits up to nearest multiple of 8 and divide by 8 to get num of 
bytes per pixel
+int nBytesPerPixel = ((mnTargetDepth + 7) & ~7)/8;
+
+//stupidly big, forget about it
+if (maTargetSize.Width() >= SAL_MAX_INT32 / nBytesPerPixel / 
maTargetSize.Height())
+{
+SAL_WARN( "vcl", "overlarge png dimensions: " <<
+maTargetSize.Width() << " x " << maTargetSize.Height() << " depth: 
" << mnTargetDepth);
+return sal_False;
+}
+
+// TODO: switch between both scanlines instead of copying
+mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
+mpScanCurrent = mpInflateInBuf;
+mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
+
+if ( !mpInflateInBuf || !mpScanPrior )
+return sal_False;
+
 mpBmp = new Bitmap( maTargetSize, mnTargetDepth );
 mpAcc = mpBmp->AcquireWriteAccess();
 if( !mpAcc )
___
Libreoffice-com

[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc

2012-04-19 Thread Caolán McNamara

 binfilter/bf_svtools/source/memtools/tl_contnr.cxx |   26 -
 binfilter/inc/bf_tools/contnr.hxx  |2 -
 2 files changed, 28 deletions(-)

New commits:
commit baa2838ed4a0d1a9dd4b2ff88e5e033a37bf31cd
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 17:29:48 2012 +0100

callcatcher: strip Container down

diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx 
b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00..2719d61 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock, 
sal_uInt16 nIndex )
 |*
 */
 
-void Container::Insert( void* p )
-{
-ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Insert()
-|*
-*/
-
 void Container::Insert( void* p, sal_uIntPtr nIndex )
 {
 if ( nCount <= nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16 
nIndex )
 |*
 */
 
-void* Container::Remove()
-{
-// Wenn kein Item vorhanden ist, NULL zurueckgeben
-if ( !nCount )
-return NULL;
-else
-return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Remove()
-|*
-*/
-
 void* Container::Remove( sal_uIntPtr nIndex )
 {
 // Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
diff --git a/binfilter/inc/bf_tools/contnr.hxx 
b/binfilter/inc/bf_tools/contnr.hxx
index 6d7e70f..9267e5e 100644
--- a/binfilter/inc/bf_tools/contnr.hxx
+++ b/binfilter/inc/bf_tools/contnr.hxx
@@ -79,10 +79,8 @@ public:
 Container( const Container& rContainer );
 ~Container();
 
-voidInsert( void* p );
 voidInsert( void* p, sal_uIntPtr nIndex );
 
-void*   Remove();
 void*   Remove( sal_uIntPtr nIndex );
 void*   Remove( void* p )
 { return Remove( GetPos( p ) ); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 10 commits - bin/get-bugzilla-attachments-by-mimetype oox/source sd/source svtools/qa unusedcode.easy vcl/source

2012-04-19 Thread Caolán McNamara

 bin/get-bugzilla-attachments-by-mimetype |   39 ++-
 oox/source/drawingml/customshapeproperties.cxx   |1 
 oox/source/ppt/timenode.cxx  |2 
 sd/source/ui/slidesorter/view/SlsButtonBar.cxx   |1 
 svtools/qa/cppunit/data/gif/fail/CVE-2007-3958-1.gif |binary
 svtools/qa/cppunit/data/gif/pass/CVE-2011-2131-1.gif |binary
 svtools/qa/cppunit/filters-test.cxx  |4 +
 unusedcode.easy  |   11 -
 vcl/source/gdi/outdev3.cxx   |   13 +++---
 9 files changed, 37 insertions(+), 34 deletions(-)

New commits:
commit e0753b7424781d9145af24b653e0a9d5c01a8657
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 17:18:03 2012 +0100

WaE: -Werror=reorder

diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index a350c4c..42150b5 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -734,9 +734,9 @@ ButtonBar::BackgroundTheme::BackgroundTheme (
 const ::boost::shared_ptr& rpTheme,
 const ::std::vector& rButtons)
 : mpTheme(rpTheme),
+  meIconSize( Button::IconSize_Large ),
   maButtonArea(),
   maBackgroundLocation(),
-  meIconSize(IconSize_Large),
   mePosition( BOTTOM )
 {
 UpdateMinimumIconSizes(rButtons);
commit 64a111d6846ee6a06a0e9cbdec98e49b9cf3de6a
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 16:21:20 2012 +0100

rearrange order

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index c92a611..c98edd7 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -348,25 +348,25 @@ common_noncore_mimetypes = [
 ]
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(novell, mimetype, "novell", extension)
+get_through_rss_query(freedesktop, mimetype, "fdo", extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(kde, mimetype, "kde", extension)
+get_through_rpc_query(redhatrpc, redhatbug, mimetype, "rhbz", extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(gnome, mimetype, "gnome", extension)
+get_through_rss_query(openoffice, mimetype, "ooo", extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(abisource, mimetype, "abi", extension)
+get_through_rss_query(novell, mimetype, "novell", extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(freedesktop, mimetype, "fdo", extension)
+get_through_rss_query(gnome, mimetype, "gnome", extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rpc_query(redhatrpc, redhatbug, mimetype, "rhbz", extension)
+get_through_rss_query(abisource, mimetype, "abi", extension)
 
 for (mimetype,extension) in mimetypes.items():
-get_through_rss_query(openoffice, mimetype, "ooo", extension)
+get_through_rss_query(kde, mimetype, "kde", extension)
 
 try:
 get_launchpad_bugs("lp")
commit 3f62c7adfd7bc400021ba2c203b6a66982b01c3d
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 10:51:10 2012 +0100

valgrind: Conditional jump or move depends on uninitialised value

diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 0304f25..a350c4c 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -736,6 +736,7 @@ ButtonBar::BackgroundTheme::BackgroundTheme (
 : mpTheme(rpTheme),
   maButtonArea(),
   maBackgroundLocation(),
+  meIconSize(IconSize_Large),
   mePosition( BOTTOM )
 {
 UpdateMinimumIconSizes(rButtons);
commit 293cfcdfbc20d1d2b2b56e2283f84678a102186b
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 10:07:51 2012 +0100

valgrind: Conditional jump or move depends on uninitialised value

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 90c0027..4271897 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -56,6 +56,7 @@ CustomShapeProperties::CustomShapeProperties()
 : mnShapePresetType ( -1 )
 , mbMirroredX   ( sal_False )
 , mbMirroredY   ( sal_False )
+, mnTextRotateAngle ( 0 )
 , mnArcNum ( 0 )
 {
 }
commit 6066637320d38700f0ac05f090494d424942932c
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 09:01:05 2012 +0100

we're more interested in getting emf/wmf samples than pdf

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index bad7a54..c92a611 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -287,7 +287,6 @@ mimetypes = {
 'application/docbook+xml': 'docbook',
 # misc
 'text/spreadsheet': 'slk',
-'applicati

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

2012-04-19 Thread Caolán McNamara

 basebmp/source/bitmapdevice.cxx |   13 +++--
 vcl/source/gdi/pngread.cxx  |   31 ++-
 2 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit 77c82b7415c6033230a3d9653a7bd6df6f109729
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 19 17:06:02 2012 +0100

backport chunk sanity test

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 2cb1447..f860920 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1825,14 +1825,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const 
basegfx::B2IVector&r
 // factor in bottom-up scanline order case
 nScanlineStride *= bTopDown ? 1 : -1;
 
-const std::size_t nMemSize( 
-(nScanlineStride < 0 ? -nScanlineStride : 
nScanlineStride)*rSize.getY() );
+const sal_uInt32 nWidth(nScanlineStride < 0 ? -nScanlineStride : 
nScanlineStride);
+const sal_uInt32 nHeight(rSize.getY());
+
+if (nHeight && nWidth && nWidth > SAL_MAX_INT32 / nHeight)
+{
+return BitmapDeviceSharedPtr();
+}
+
+const std::size_t nMemSize(nWidth * nHeight);
 
 if( !pMem )
 {
 pMem.reset(
 reinterpret_cast(rtl_allocateMemory( nMemSize )),
 &rtl_freeMemory );
+if (pMem.get() == 0 && nMemSize != 0)
+return BitmapDeviceSharedPtr();
 rtl_zeroMemory(pMem.get(),nMemSize);
 }
 
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 1858f76..1f3c955 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -203,6 +203,7 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
 mpScanCurrent  ( NULL ),
 mpColorTable   ( (sal_uInt8*) mpDefaultColorTable ),
 mnPass ( 0 ),
+mbPalette( sal_False ),
 mbzCodecInUse  ( sal_False ),
 mbStatus( sal_True),
 mbIDAT( sal_False ),
@@ -306,7 +307,7 @@ bool PNGReaderImpl::ReadNextChunk()
 nCRC32 = rtl_crc32( nCRC32, &rChunkData.aData[ 0 ], mnChunkLen );
 maDataIter = rChunkData.aData.begin();
 }
-sal_uInt32 nCheck;
+sal_uInt32 nCheck(0);
 mrPNGStream >> nCheck;
 if( nCRC32 != nCheck )
 return false;
@@ -348,14 +349,23 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& 
rPreviewSizeHint )
 // reset to the first chunk
 maChunkIter = maChunkSeq.begin();
 
-// parse the chunks
+// first chunk must be IDHR
+if( mbStatus && ReadNextChunk() )
+{
+if (mnChunkType == PNGCHUNK_IHDR)
+mbStatus = ImplReadHeader( rPreviewSizeHint );
+else
+mbStatus = false;
+}
+
+// parse the remaining chunks
 while( mbStatus && !mbIDAT && ReadNextChunk() )
 {
 switch( mnChunkType )
 {
 case PNGCHUNK_IHDR :
 {
-mbStatus = ImplReadHeader( rPreviewSizeHint );
+mbStatus = false; //IHDR should only appear as the first chunk
 }
 break;
 
@@ -765,14 +775,17 @@ sal_Bool PNGReaderImpl::ImplReadTransparent()
 {
 if ( mnChunkLen <= 256 )
 {
+mbTransparent = true;
 mpTransTab = new sal_uInt8 [ 256 ];
 rtl_fillMemory( mpTransTab, 256, 0xff );
-rtl_copyMemory( mpTransTab, &(*maDataIter), mnChunkLen );
-maDataIter += mnChunkLen;
-mbTransparent = true;
-// need alpha transparency if not on/off masking
-for( int i = 0; i < mnChunkLen; ++i )
-   bNeedAlpha |= (mpTransTab[i]!=0x00) && 
(mpTransTab[i]!=0xFF);
+if (mnChunkLen > 0)
+{
+rtl_copyMemory( mpTransTab, &(*maDataIter), mnChunkLen 
);
+maDataIter += mnChunkLen;
+// need alpha transparency if not on/off masking
+for( int i = 0; i < mnChunkLen; ++i )
+   bNeedAlpha |= (mpTransTab[i]!=0x00) && 
(mpTransTab[i]!=0xFF);
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 11 commits - bin/get-bugzilla-attachments-by-mimetype comphelper/inc comphelper/source cppcanvas/Library_cppcanvas.mk cppcanvas/source sc/source svtools/inc svtools/qa svtools

2012-04-18 Thread Caolán McNamara

 bin/get-bugzilla-attachments-by-mimetype |6 -
 comphelper/inc/comphelper/logging.hxx|   13 --
 comphelper/source/misc/logging.cxx   |6 -
 cppcanvas/Library_cppcanvas.mk   |1 
 cppcanvas/source/wrapper/basegfxfactory.cxx  |   10 +
 cppcanvas/source/wrapper/impltext.cxx|   96 ---
 cppcanvas/source/wrapper/impltext.hxx|   73 --
 cppcanvas/source/wrapper/vclfactory.cxx  |1 
 sc/source/filter/inc/stylesbuffer.hxx|   13 --
 sc/source/filter/oox/addressconverter.cxx|   16 ---
 sc/source/filter/oox/stylesbuffer.cxx|   91 --
 svtools/inc/svtools/svlbitm.hxx  |1 
 svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg |binary
 svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg |binary
 svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg |binary
 svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg |binary
 svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg |binary
 svtools/qa/cppunit/filters-test.cxx  |4 
 svtools/source/contnr/svlbitm.cxx|7 -
 svtools/source/edit/texteng.cxx  |   15 --
 svtools/source/misc/embedhlp.cxx |2 
 svtools/source/misc/templatefoldercache.cxx  |6 -
 svtools/source/svrtf/svparser.cxx|   31 --
 svtools/source/uno/unoiface.cxx  |5 
 svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx |4 
 svx/source/sdr/contact/viewcontactofpageobj.cxx  |6 -
 svx/source/svdraw/svdibrow.cxx   |   27 ++---
 toolkit/source/awt/vclxdevice.cxx|6 -
 tools/source/fsys/tempfile.cxx   |6 -
 unusedcode.easy  |4 
 30 files changed, 35 insertions(+), 415 deletions(-)

New commits:
commit 7a799fc6ada8d3e5ea2bd0b2617e3a8e7405997a
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 18 13:01:29 2012 +0100

use stdout for errors like everything else

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index c719fc3..cf79a79 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -162,7 +162,7 @@ def get_through_rss_query_url(url, mimetype, prefix, 
suffix):
 try:
 get_bug_function(entry['id'], mimetype, prefix, suffix)
 except:
-print >> sys.stderr, entry['id'], "failed:", sys.exc_info()[0]
+print entry['id'], "failed:", sys.exc_info()[0]
 pass
 
 def get_through_rss_query(queryurl, mimetype, prefix, suffix):
commit 137e02c0adfacaf8c5fc08dd5cc445be7fdfa6e5
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 18 10:28:00 2012 +0100

jpg parsing regression test

diff --git a/svtools/qa/cppunit/data/jpg/fail/.gitignore 
b/svtools/qa/cppunit/data/jpg/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg 
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg
new file mode 100644
index 000..3d9481a
Binary files /dev/null and 
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg 
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg
new file mode 100644
index 000..9d26db0
Binary files /dev/null and 
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg 
b/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg
new file mode 100644
index 000..33bbe9b
Binary files /dev/null and 
b/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/indeterminate/.gitignore 
b/svtools/qa/cppunit/data/jpg/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/svtools/qa/cppunit/data/jpg/pass/.gitignore 
b/svtools/qa/cppunit/data/jpg/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg 
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg
new file mode 100644
index 000..5eb27ff
Binary files /dev/null and 
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg 
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg
new file mode 100644
index 000..4917f20
Binary files /dev/null and 
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg differ
diff --git a/svtools/qa/cppunit/filters-test.cxx 
b/svtools/qa/cppunit/filters-test.cxx
index 296d96e..4168894 100644
--- a/svtools/qa/cppunit/filters-test.cxx
+++ b/svtools/qa/cppunit/filters-test.cxx
@@ -84,6 +84,10 @@ void SvtoolsFiltersTest::testCVEs()
 testDir(rtl::OUString(),
 getURLFromSrc("/svt

[Libreoffice-commits] .: sc/source

2012-04-17 Thread Caolán McNamara

 sc/source/filter/oox/workbookhelper.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 8ae293f0a1509b26f9a65f9297fddca7b106e46e
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 17 20:49:51 2012 +0100

WaE: MacOSX pScRangeData may be unused uninitialized

diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 479f504..83c67bd 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -382,8 +382,7 @@ ScRangeData* lcl_addNewByNameAndTokens( ScDocument& rDoc, 
ScRangeName* pNames, c
 ScRangeData* WorkbookGlobals::createNamedRangeObject( OUString& orName, const 
Sequence< FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) const
 {
 // create the name and insert it into the Calc document
-Reference< XNamedRange > xNamedRange;
-ScRangeData* pScRangeData;
+ScRangeData* pScRangeData = NULL;
 if( !orName.isEmpty() ) try
 {
 // find an unused name
@@ -396,7 +395,7 @@ ScRangeData* WorkbookGlobals::createNamedRangeObject( 
OUString& orName, const Se
 ScRangeName* pNames = rDoc.GetRangeName();
 pScRangeData = lcl_addNewByNameAndTokens( rDoc, pNames, orName, 
rTokens, nIndex, nNameFlags );
 }
-catch( Exception& )
+catch (const Exception&)
 {
 }
 return pScRangeData;
@@ -405,8 +404,7 @@ ScRangeData* WorkbookGlobals::createNamedRangeObject( 
OUString& orName, const Se
 ScRangeData* WorkbookGlobals::createLocalNamedRangeObject( OUString& orName, 
const Sequence< FormulaToken >&  rTokens, sal_Int32 nIndex, sal_Int32 
nNameFlags, sal_Int32 nTab ) const
 {
 // create the name and insert it into the Calc document
-Reference< XNamedRange > xNamedRange;
-ScRangeData* pScRangeData;
+ScRangeData* pScRangeData = NULL;
 if( !orName.isEmpty() ) try
 {
 // find an unused name
@@ -423,7 +421,7 @@ ScRangeData* WorkbookGlobals::createLocalNamedRangeObject( 
OUString& orName, con
 ScRangeName* pNames = rDoc.GetRangeName( nTab );
 pScRangeData = lcl_addNewByNameAndTokens( rDoc, pNames, orName, 
rTokens, nIndex, nNameFlags );
 }
-catch( Exception& )
+catch (const Exception&)
 {
 }
 return pScRangeData;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2012-04-17 Thread Caolán McNamara

 writerfilter/source/dmapper/GraphicHelpers.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b92de73fdd81acc5fdb92005af34b3ce9f8ed37b
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 17 20:11:20 2012 +0100

WaE: MacOSX itemZOrder may be unused uninitialized

diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 819dc6f..551c5e9 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -240,7 +240,7 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 
relativeHeight )
 {
 if( items.empty())
 return 0;
-sal_Int32 itemZOrder;
+sal_Int32 itemZOrder(0);
 --it;
 if( 
it->second->getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
 .GetName( PROP_Z_ORDER )) >>= itemZOrder )
@@ -248,7 +248,7 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 
relativeHeight )
 }
 else
 {
-sal_Int32 itemZOrder;
+sal_Int32 itemZOrder(0);
 if( 
it->second->getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
 .GetName( PROP_Z_ORDER )) >>= itemZOrder )
 return itemZOrder; // before the item
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basebmp/source svtools/qa vcl/source

2012-04-17 Thread Caolán McNamara

 basebmp/source/bitmapdevice.cxx  |   12 ++-
 svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png |3 +
 svtools/qa/cppunit/data/png/fail/CVE-2005-0633-1.png |binary
 svtools/qa/cppunit/data/png/fail/CVE-2006-7210-1.png |binary
 svtools/qa/cppunit/data/png/fail/CVE-2007-2365-1.png |binary
 svtools/qa/cppunit/data/png/fail/CVE-2009-1511-1.png |1 
 svtools/qa/cppunit/data/png/pass/black.png   |binary
 svtools/qa/cppunit/filters-test.cxx  |4 ++
 vcl/source/gdi/pngread.cxx   |   31 +--
 9 files changed, 40 insertions(+), 11 deletions(-)

New commits:
commit 9ff94ae0fa947c5fd6a31fbc38421f60eb5e1fba
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 17 16:45:23 2012 +0100

png parsing regression test

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 1586fce..b3676c6 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1881,8 +1881,16 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const 
basegfx::B2IVector&
 // factor in bottom-up scanline order case
 nScanlineStride *= bTopDown ? 1 : -1;
 
-const std::size_t nMemSize(
-(nScanlineStride < 0 ? -nScanlineStride : 
nScanlineStride)*rSize.getY() );
+const sal_uInt32 nWidth(nScanlineStride < 0 ? -nScanlineStride : 
nScanlineStride);
+const sal_uInt32 nHeight(rSize.getY());
+
+if (nHeight && nWidth && nWidth > SAL_MAX_INT32 / nHeight)
+{
+SAL_WARN( "basebmp", "suspicious massive alloc " << nWidth << " * " << 
nHeight);
+return BitmapDeviceSharedPtr();
+}
+
+const std::size_t nMemSize(nWidth * nHeight);
 
 if( !pMem )
 {
diff --git a/svtools/qa/cppunit/data/png/fail/.gitignore 
b/svtools/qa/cppunit/data/png/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png 
b/svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png
new file mode 100644
index 000..fa90a29
--- /dev/null
+++ b/svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png
@@ -0,0 +1,3 @@
+Àë#Mb£}ÕÔo7ë2ÎË~X¨á.^TÿwBè!õf1±°ÿ»±sé
tùgça2bA±ÕðÁËHbè"8àî|ìeGfS$N0nIÖªõ
+Ôç0"ðJG°zÀ¤Ü¢(s?d)À"ËÿGE¢×F¯9~}ÇrÕ   
TÎp?áÅÂ*¿ìò·¥ckµ$E"Xï¯8á¾=2±T_3³v¿#é
á$Hh4«JÑKiÝJÿ&7rúÏ=u¯ù69KÙjãûäÎçèÿëWh{é½Ï$·
dVÅÜ[îÐÐÊy\à%º%Ç¾H®meÛÃÞ+
Á}ÀgXI¡2ñ>*Ä«õ&ùÕúÍ·
)Ì¸6ÔpUTjODhÙ¶1éù-ÄÔ> nCheck;
 if( nCRC32 != nCheck )
 return false;
@@ -339,14 +340,23 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& 
rPreviewSizeHint )
 // reset to the first chunk
 maChunkIter = maChunkSeq.begin();
 
-// parse the chunks
+// first chunk must be IDHR
+if( mbStatus && ReadNextChunk() )
+{
+if (mnChunkType == PNGCHUNK_IHDR)
+mbStatus = ImplReadHeader( rPreviewSizeHint );
+else
+mbStatus = false;
+}
+
+// parse the remaining chunks
 while( mbStatus && !mbIDAT && ReadNextChunk() )
 {
 switch( mnChunkType )
 {
 case PNGCHUNK_IHDR :
 {
-mbStatus = ImplReadHeader( rPreviewSizeHint );
+mbStatus = false; //IHDR should only appear as the first chunk
 }
 break;
 
@@ -756,14 +766,17 @@ sal_Bool PNGReaderImpl::ImplReadTransparent()
 {
 if ( mnChunkLen <= 256 )
 {
+mbTransparent = true;
 mpTransTab = new sal_uInt8 [ 256 ];
 rtl_fillMemory( mpTransTab, 256, 0xff );
-rtl_copyMemory( mpTransTab, &(*maDataIter), mnChunkLen );
-maDataIter += mnChunkLen;
-mbTransparent = true;
-// need alpha transparency if not on/off masking
-for( int i = 0; i < mnChunkLen; ++i )
-   bNeedAlpha |= (mpTransTab[i]!=0x00) && 
(mpTransTab[i]!=0xFF);
+if (mnChunkLen > 0)
+{
+rtl_copyMemory( mpTransTab, &(*maDataIter), mnChunkLen 
);
+maDataIter += mnChunkLen;
+// need alpha transparency if not on/off masking
+for( int i = 0; i < mnChunkLen; ++i )
+   bNeedAlpha |= (mpTransTab[i]!=0x00) && 
(mpTransTab[i]!=0xFF);
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - bin/get-bugzilla-attachments-by-mimetype cui/source sc/source sd/source unusedcode.easy vcl/unx

2012-04-17 Thread Caolán McNamara

 bin/get-bugzilla-attachments-by-mimetype |   16 -
 cui/source/options/optinet2.cxx  |8 
 sc/source/filter/inc/addressconverter.hxx|   18 -
 sc/source/filter/inc/richstring.hxx  |1 
 sc/source/filter/inc/stylesbuffer.hxx|3 
 sc/source/filter/oox/addressconverter.cxx|  170 ---
 sc/source/filter/oox/richstring.cxx  |   20 -
 sc/source/filter/oox/stylesbuffer.cxx|   14 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |   25 -
 unusedcode.easy  |2 
 vcl/unx/generic/app/wmadaptor.cxx|6 
 11 files changed, 16 insertions(+), 267 deletions(-)

New commits:
commit 605c51cebbcf352d52595a0b28288ebc9dcfbdbb
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 17 09:49:07 2012 +0100

attachmentid should be stable across mime-type changes

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 7316f0a..b9488b9 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -66,8 +66,9 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
 sock = urlopen_retry(url+"&ctype=xml")
 dom = minidom.parse(sock)
 sock.close()
-attachmentid=1
+attachmentid=0
 for attachment in dom.getElementsByTagName('attachment'):
+attachmentid += 1
 print " mimetype is",
 for node in attachment.childNodes:
 if node.nodeName == 'type':
@@ -82,7 +83,6 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
 f.write(base64.b64decode(node.firstChild.nodeValue))
 f.close()
 break
-attachmentid += 1
 
 def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
 id = url.rsplit('=', 2)[1]
@@ -94,20 +94,24 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
 sock = urlopen_retry(url+"&ctype=xml")
 dom = minidom.parse(sock)
 sock.close()
-attachmentid=1
+attachmentid=0
 for comment in dom.getElementsByTagName('thetext'):
 commentText = comment.firstChild.nodeValue
 match = re.search(r".*Created an attachment \(id=([0-9]+)\)", 
commentText)
 if not match:
 continue
 
+attachmentid += 1
+
 realAttachmentId = match.group(1)
 handle = urlopen_retry(novellattach + realAttachmentId)
 if not handle:
 print "attachment %s is not accessible", realAttachmentId
 continue 
+print " mimetype is",
 
 remoteMime = handle.info().gettype()
+print remoteMime,
 if remoteMime != mimetype:
 print "skipping"
 continue
@@ -117,8 +121,6 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
 f = open(download, 'w')
 f.write(handle.read())
 f.close()
-break
-attachmentid += 1
 
 def get_through_rpc_query(rpcurl, showurl, mimetype, prefix, suffix):
 try:
@@ -175,8 +177,9 @@ def get_launchpad_bugs(prefix):
 bug = bugtask.bug
 id = str(bug.id)
 print "parsing ", id, "status:", bugtask.status, "title:", 
bug.title[:50]
-attachmentid = 1
+attachmentid = 0
 for attachment in bug.attachments:
+attachmentid += 1
 handle = attachment.data.open()
 if not handle.content_type in mimetypes:
 #print "skipping"
@@ -200,7 +203,6 @@ def get_launchpad_bugs(prefix):
 f = open(download, "w")
 f.write(handle.read())
 f.close()
-attachmentid += 1
 
 freedesktop = 'http://bugs.freedesktop.org/buglist.cgi'
 abisource = 'http://bugzilla.abisource.com/buglist.cgi' #added for abiword
commit 18825a4d596f69793ee11e643f6ea34317a880c9
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 17 00:47:00 2012 +0100

callcatcher: update unused code list

diff --git a/sc/source/filter/inc/addressconverter.hxx 
b/sc/source/filter/inc/addressconverter.hxx
index 3f77269..261752c 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -247,24 +247,6 @@ public:
 sal_Int32 nStart = 0,
 sal_Int32 nLength = SAL_MAX_INT32 );
 
-/** Tries to parse an encoded name of an external link target in BIFF
-documents, e.g. from EXTERNSHEET or SUPBOOK records.
-
-@param orClassName  (out-parameter) DDE server name or OLE class name.
-@param orTargetUrl  (out-parameter) Target URL, DDE topic or OLE 
object name.
-@param orSheetName  (out-parameter) Sheet name i

[Libreoffice-commits] .: sot/source

2012-04-16 Thread Caolán McNamara

 sot/source/sdstor/stgelem.cxx |6 --
 sot/source/sdstor/stgelem.hxx |1 -
 2 files changed, 7 deletions(-)

New commits:
commit c29d22ce5d1d8c35218a7bf9939863aa2e058aa7
Author: Laureano G. Linde 
Date:   Sun Apr 15 18:47:57 2012 +0200

Removed StgHeader::SetClassId(ClsId const &)

diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index ff73a59..c51dc1b 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -187,12 +187,6 @@ void StgHeader::SetFATPage( short n, sal_Int32 nb )
 }
 }
 
-void StgHeader::SetClassId( const ClsId& r )
-{
-if( memcmp( &aClsId, &r, sizeof( ClsId ) ) )
-bDirty = sal_True, memcpy( &aClsId, &r, sizeof( ClsId ) );
-}
-
 void StgHeader::SetTOCStart( sal_Int32 n )
 {
 if( n != nTOCstrm ) bDirty = sal_True, nTOCstrm = n;
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7792608..6ea349e 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -87,7 +87,6 @@ public:
 void  SetMasters( sal_Int32 n );
 short GetFAT1Size() const   { return 109;   }
 const ClsId& GetClassId() const { return aClsId;}
-void  SetClassId( const ClsId& );
 sal_Int32 GetFATPage( short ) const;
 void  SetFATPage( short, sal_Int32 );
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: package/source

2012-04-16 Thread Caolán McNamara

 package/source/manifest/ManifestExport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c558610bdc5b9abc8e81b45e545983cc3a79670
Author: Udo Schuermann 
Date:   Mon Apr 16 21:48:01 2012 +0100

a tiny spelling mistak

diff --git a/package/source/manifest/ManifestExport.cxx 
b/package/source/manifest/ManifestExport.cxx
index 40786db..8bbb4ce 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -302,7 +302,7 @@ ManifestExport::ManifestExport( uno::Reference< 
xml::sax::XDocumentHandler > xHa
 sEncAlgName = sBlowfish_Name;
 }
 else
-throw uno::RuntimeException( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpecte encryption algorithm is 
provided!" ) ), uno::Reference< uno::XInterface >() );
+throw uno::RuntimeException( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected encryption algorithm is 
provided!" ) ), uno::Reference< uno::XInterface >() );
 
 pNewAttrList->AddAttribute ( sAlgorithmNameAttribute, 
sCdataAttribute, sEncAlgName );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - connectivity/source sc/source sd/source unusedcode.easy

2012-04-16 Thread Caolán McNamara

 connectivity/source/drivers/mozab/MCatalog.cxx|6 -
 connectivity/source/drivers/mozab/MCatalog.hxx|1 
 connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx |   18 ---
 connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx |3 
 sc/source/filter/inc/condformatbuffer.hxx |3 
 sc/source/filter/inc/defnamesbuffer.hxx   |3 
 sc/source/filter/inc/externallinkbuffer.hxx   |5 
 sc/source/filter/oox/condformatbuffer.cxx |   34 -
 sc/source/filter/oox/defnamesbuffer.cxx   |6 -
 sc/source/filter/oox/externallinkbuffer.cxx   |   58 --
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx  |   29 -
 sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx|1 
 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx |8 -
 sd/source/ui/slidesorter/view/SlsButtonBar.cxx|8 -
 sd/source/ui/slidesorter/view/SlsFontProvider.cxx |   29 -
 unusedcode.easy   |   11 -
 16 files changed, 223 deletions(-)

New commits:
commit 5e26d135dac662d2cc2c448a851ef4b9f6c6133f
Author: Santiago Martinez 
Date:   Mon Apr 16 21:39:46 2012 +0100

Remove unused code in sd

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 5849b1c..54aa95b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -139,9 +139,6 @@ public:
 const AcceptDropEvent& rEvent,
 const sal_Int8 nDragAction,
 SlideSorter& rSlideSorter);
-EventDescriptor (
-const KeyEvent& rEvent,
-SlideSorter& rSlideSorter);
 
 private:
 /** Compute a numerical code that describes a mouse event and that can
@@ -977,32 +974,6 @@ SelectionFunction::EventDescriptor::EventDescriptor (
 
 
 
-SelectionFunction::EventDescriptor::EventDescriptor (
-const KeyEvent& rEvent,
-SlideSorter& rSlideSorter)
-: maMousePosition(),
-  maMouseModelPosition(),
-  mpHitDescriptor(),
-  mpHitPage(),
-  mnEventCode(KEY_EVENT),
-  
mbIsOverButton(rSlideSorter.GetView().GetButtonBar().IsMouseOverButton()),
-  meDragMode(InsertionIndicatorHandler::MoveMode),
-  mbMakeSelectionVisible(true),
-  mbIsLeaving(false)
-{
-model::SharedPageDescriptor pHitDescriptor (
-
rSlideSorter.GetController().GetFocusManager().GetFocusedPageDescriptor());
-if (pHitDescriptor.get() != NULL)
-{
-mpHitPage = pHitDescriptor->GetPage();
-mpHitDescriptor = pHitDescriptor;
-}
-
-mnEventCode |= EncodeKeyEvent(rEvent) | EncodeState();
-}
-
-
-
 
 sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent (
 const MouseEvent& rEvent) const
diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index a6a3482..6bb273f 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -224,7 +224,6 @@ public:
 virtual Size GetSize (void) const;
 virtual Size GetSize (const IconSize eIconSize) const;
 ::rtl::OUString GetHelpText (void) const;
-bool IsDown (void) const;
 void SetActiveState (const bool bIsActive);
 bool IsActive (void) const;
 void SetIconSize (const IconSize eIconSize);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index 8248747..2e2513c 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -54,14 +54,6 @@ public:
 */
 static FontProvider& Instance (void);
 
-/** Return a font that is scaled according to the current map mode of
-the given device.  Repeated calls with a device, not necessarily the
-same device, with the same map mode will return the same font.  The
-first call with a different map mode will release the old font and
-create a new one that is correctly scaled.
-*/
-SharedFontPointer GetFont (const OutputDevice& rDevice);
-
 /** Call this method to tell an object to release its currently used
 font.  The next call to GetFont() will then create a new one.
 Typically called after a DataChange event when for instance a system
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 28c5a26..0304f25 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -924,14 +924,6 @@ Rectangle Button::GetBoundingBox (void) const
 
 
 
-bool Button::IsDown (void) const
-{
-return mbIsActive && meState==State_Down;
-}
-
-

[Libreoffice-commits] .: cui/source unusedcode.easy

2012-04-16 Thread Caolán McNamara

 cui/source/dialogs/about.cxx |4 
 cui/source/dialogs/about.hrc |1 +
 cui/source/dialogs/about.src |7 +++
 cui/source/inc/about.hxx |1 +
 unusedcode.easy  |1 -
 5 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 36245c84bacd30135ba20ad459d9450300c78b00
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 16 16:43:39 2012 +0100

Resolves: fdo#48723 add a (hidden) CancelButton so ESC closes about dialog

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 0703f65..dd39869 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -77,6 +77,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
 aCreditsButton   ( this, ResId( ABOUT_BTN_CREDITS, 
*rId.GetResMgr() ) ),
 aWebsiteButton   ( this, ResId( ABOUT_BTN_WEBSITE, 
*rId.GetResMgr() ) ),
 aLicenseButton   ( this, ResId( ABOUT_BTN_LICENSE, 
*rId.GetResMgr() ) ),
+aCancelButton( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() 
) ),
 aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())),
 m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
 m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
@@ -110,6 +111,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& 
rId) :
 aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 
+aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
+aCancelButton.Hide();
+
 FreeResource();
 
 // explicit Help-Id
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index 2841155..e2c8a64 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -45,3 +45,4 @@
 #define ABOUT_BTN_LICENSE   16
 #define ABOUT_VERSION_TEXT  17
 #define ABOUT_STR_DESCRIPTION   18
+#define ABOUT_BTN_CANCEL19
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index a962503..1e38496 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -122,6 +122,13 @@ ModalDialog RID_DEFAULTABOUT
 Text [ en-US ] = "libreoffice.org";
 DefButton = TRUE ;
 };
+CancelButton ABOUT_BTN_CANCEL
+{
+DefButton = TRUE ;
+Pos = MAP_APPFONT ( 174 , 6 ) ;
+Size = MAP_APPFONT ( 50 , 14 ) ;
+Text [ en-US ] = "~Close";
+};
 FixedImage ABOUT_IMAGE_LOGO
 {
 };
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index c94dea1..2a81c37 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -56,6 +56,7 @@ private:
 PushButton  aCreditsButton;
 PushButton  aWebsiteButton;
 PushButton  aLicenseButton;
+CancelButtonaCancelButton;
 
 String aVersionData;
 String aVersionTextStr;
diff --git a/unusedcode.easy b/unusedcode.easy
index 946e677..b016694 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,3 @@
-AboutDialog::LinkStubCancelHdl(void*, void*)
 
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence, com::sun::star::uno::Sequence, unsigned char)
 CharAttribList::Clear()
 Dialog::Dialog(Window*, ResId const&)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

2012-04-16 Thread Caolán McNamara

 cui/source/dialogs/about.cxx |4 ++--
 cui/source/dialogs/about.hrc |   36 ++--
 cui/source/dialogs/about.src |4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit f73d26889692599aadaba28db406f430b9af7d8c
Author: Andrew Higginson 
Date:   Mon Apr 16 16:33:41 2012 +0100

Resolves: fdo#48659 about dialog misses BuildID

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a4352e1..0703f65 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -368,10 +368,10 @@ rtl::OUString AboutDialog::GetVersionString()
 
 rtl::OUString sBuildId = GetBuildId();
 
-if (!sBuildId.isEmpty())
+if (!(sBuildId.trim()).isEmpty())
 {
 sVersion += " ";
-sVersion += m_sBuildStr.replaceAll("%BUILDID", sBuildId);
+sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId);
 }
 
 return sVersion;
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index 40dd4a2..2841155 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -27,21 +27,21 @@
 
 #include 
 
-#define ABOUT_STR_BUILD 6
-#define ABOUT_STR_VERSION   7
-#define ABOUT_STR_VENDOR8
-#define ABOUT_STR_COPYRIGHT 9
-#define ABOUT_STR_BASED 10
-#define ABOUT_STR_BASED_DERIVED 11
-#define ABOUT_STR_LINK_WEBSITE  13
-#define ABOUT_STR_LINK_CREDITS 15
-#define ABOUT_STR_LINK_LICENSE 22
-#define ABOUT_BTN_CREDITS17
-#define ABOUT_DESCRIPTION_TEXT 18
-#define ABOUT_COPYRIGHT_TEXT 24
-#define ABOUT_COPYRIGHT_TEXT_SHADOW 25
-#define ABOUT_IMAGE_LOGO 19
-#define ABOUT_BTN_WEBSITE20
-#define ABOUT_BTN_LICENSE21
-#define ABOUT_VERSION_TEXT 23
-#define ABOUT_STR_DESCRIPTION 24
+#define ABOUT_STR_BUILD 1
+#define ABOUT_STR_VERSION   2
+#define ABOUT_STR_VENDOR3
+#define ABOUT_STR_COPYRIGHT 4
+#define ABOUT_STR_BASED 5
+#define ABOUT_STR_BASED_DERIVED 6
+#define ABOUT_STR_LINK_WEBSITE  7
+#define ABOUT_STR_LINK_CREDITS  8
+#define ABOUT_STR_LINK_LICENSE  9
+#define ABOUT_BTN_CREDITS   10
+#define ABOUT_DESCRIPTION_TEXT  11
+#define ABOUT_COPYRIGHT_TEXT12
+#define ABOUT_COPYRIGHT_TEXT_SHADOW 13
+#define ABOUT_IMAGE_LOGO14
+#define ABOUT_BTN_WEBSITE   15
+#define ABOUT_BTN_LICENSE   16
+#define ABOUT_VERSION_TEXT  17
+#define ABOUT_STR_DESCRIPTION   18
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 6de34e5..a962503 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -71,7 +71,7 @@ ModalDialog RID_DEFAULTABOUT
 };
 String ABOUT_STR_VERSION
 {
-Text = "version %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX 
%PRODUCTEXTENSION";
+Text [ en-US ] = "version 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION";
 };
 String ABOUT_STR_DESCRIPTION
 {
@@ -95,7 +95,7 @@ ModalDialog RID_DEFAULTABOUT
 };
 String ABOUT_STR_BUILD
 {
-Text[ en-US ] = "(Build ID: %BUILDID)";
+Text[ en-US ] = "(Build ID: $BUILDID)";
 };
 String ABOUT_STR_LINK_WEBSITE
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 6 commits - vcl/inc vcl/source vcl/unx

2012-04-16 Thread Caolán McNamara

 vcl/inc/vcl/builder.hxx |4 -
 vcl/inc/vcl/layout.hxx  |   65 
 vcl/inc/vcl/tabpage.hxx |4 -
 vcl/inc/vcl/window.hxx  |7 +
 vcl/source/control/combobox.cxx |7 +
 vcl/source/control/lstbox.cxx   |4 -
 vcl/source/window/builder.cxx   |  154 +---
 vcl/source/window/dialog.cxx|   30 ++-
 vcl/source/window/layout.cxx|  133 +++---
 vcl/source/window/tabpage.cxx   |   11 +-
 vcl/source/window/window.cxx|   65 +++-
 vcl/unx/gtk/a11y/atkwindow.cxx  |2 
 12 files changed, 334 insertions(+), 152 deletions(-)

New commits:
commit e1b187d929ed7491e4bad1c0424d031c64d922cb
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 16 15:14:42 2012 +0100

basic optimization pass

diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index 5ff66ce..5edf199 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.hxx
@@ -59,8 +59,10 @@ public:
 virtual voidActivatePage();
 virtual voidDeactivatePage();
 
+//To-Do, inherit from VclContainer
+using Window::SetPosSizePixel;
+virtual voidSetPosSizePixel(const Point& rNewPos, const Size& 
rNewSize);
 virtual SizeGetOptimalSize(WindowSizeType eType) const;
-virtual voidResize();
 };
 
 #endif  // _SV_TABPAGE_HXX
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index db3bfb2..6756e32 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -95,8 +95,9 @@ ComboBox::~ComboBox()
 SetSubEdit( NULL );
 delete mpSubEdit;
 
-delete mpImplLB;
+ImplListBox *pImplLB = mpImplLB;
 mpImplLB = NULL;
+delete pImplLB;
 
 delete mpFloatWin;
 delete mpBtn;
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 0f82e65..951c3e9 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -84,11 +84,11 @@ ListBox::~ListBox()
 //#109201#
 ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
 
-delete mpImplLB;
-
 // Beim zerstoeren des FloatWins macht TH ein GrabFocus auf den Parent,
 // also diese ListBox => PreNotify()...
+ImplListBox *pImplLB = mpImplLB;
 mpImplLB = NULL;
+delete pImplLB;
 
 delete mpFloatWin;
 delete mpImplWin;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e810189..fd189ed 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -537,6 +537,22 @@ void Dialog::StateChanged( StateChangedType nType )
 
 if ( nType == STATE_CHANGE_INITSHOW )
 {
+if (isLayoutEnabled())
+{
+maLayoutTimer.Stop();
+
+//resize dialog to fit requisition on initial show
+const Window *pContainer = GetWindow(WINDOW_FIRSTCHILD);
+Size aSize = pContainer->get_preferred_size();
+
+Size aMax = GetOptimalSize(WINDOWSIZE_MAXIMUM);
+aSize.Width() = std::min(aMax.Width(), aSize.Width());
+aSize.Height() = std::min(aMax.Height(), aSize.Height());
+
+SetMinOutputSizePixel(aSize);
+SetSizePixel(aSize);
+}
+
 if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
 ImplWindowAutoMnemonic( this );
 
@@ -1022,8 +1038,8 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, 
const Size& rSize, sal
 
 bool Dialog::isLayoutEnabled() const
 {
-//Has one child, and that child is a container => we're layout enabled
-return (GetChildCount() == 1 && dynamic_cast(GetChild(0)));
+//Child is a container => we're layout enabled
+return dynamic_cast(GetWindow(WINDOW_FIRSTCHILD));
 }
 
 Size Dialog::GetOptimalSize(WindowSizeType eType) const
@@ -1031,7 +1047,7 @@ Size Dialog::GetOptimalSize(WindowSizeType eType) const
 if (eType == WINDOWSIZE_MAXIMUM || !isLayoutEnabled())
 return SystemWindow::GetOptimalSize(eType);
 
-Size aSize = GetChild(0)->GetOptimalSize(eType);
+Size aSize = GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(eType);
 return Window::CalcWindowSize(aSize);
 }
 
@@ -1042,13 +1058,17 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*, 
EMPTYARG )
 aSize.Width() -= mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder;
 aSize.Height() -= mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder;
 Point aPos(mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder);
-GetChild(0)->SetPosSizePixel(aPos, aSize);
+GetWindow(WINDOW_FIRSTCHILD)->SetPosSizePixel(aPos, aSize);
 return 0;
 }
 
 void Dialog::Resize()
 {
-if (hasPendingLayout() || !isLayoutEnabled())
+if (hasPendingLayout())
+return;
+if (IsInClose())
+return;
+if (!isLayoutEnabled())
 return;
 maLayoutTimer.Start();
 }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index af3763b..5d6b587 100644
--- a/vcl/source/window/layout.cxx
+++ b

[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svtools binfilter/bf_svx binfilter/bf_xmloff binfilter/inc

2012-04-16 Thread Caolán McNamara

 binfilter/bf_sd/source/filter/sd_sdfilter.cxx   |   28 
 binfilter/bf_svtools/source/config/svt_saveopt.cxx  |6 
 binfilter/bf_svx/source/xml/svx_xmleohlp.cxx|   16 ---
 binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx |9 --
 binfilter/inc/bf_sd/sdfilter.hxx|2 -
 binfilter/inc/bf_svtools/saveopt.hxx|2 -
 binfilter/inc/bf_svx/xmleohlp.hxx   |5 ---
 7 files changed, 68 deletions(-)

New commits:
commit af20ea3f8376a9d29d00d06b106fc49ca85377af
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 15 22:37:43 2012 +0100

callcatcher: remove newly unused code

diff --git a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx 
b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
index 6dcf962..01a84a7 100644
--- a/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
+++ b/binfilter/bf_sd/source/filter/sd_sdfilter.cxx
@@ -77,34 +77,6 @@ SdFilter::~SdFilter()
 
 // 
-
 
-void SdFilter::CreateStatusIndicator()
-{
-try
-{
-if (mxModel.is())
-{
-Reference< XController > xController( 
mxModel->getCurrentController());
-if( xController.is())
-{
-Reference< XFrame > xFrame( xController->getFrame());
-if( xFrame.is())
-{
-Reference< XStatusIndicatorFactory > xFactory( xFrame, 
UNO_QUERY );
-if( xFactory.is())
-{
-mxStatusIndicator = xFactory->createStatusIndicator();
-}
-}
-}
-}
-}
-catch( Exception& )
-{
-}
-}
-
-// 
-
-
 void SdFilter::CreateProgress()
 {
 mpProgress = new SfxProgress( &mrDocShell, String( SdResId( STR_LOAD_DOC ) 
), 100 );
diff --git a/binfilter/bf_svtools/source/config/svt_saveopt.cxx 
b/binfilter/bf_svtools/source/config/svt_saveopt.cxx
index 14b5aeb..0799517 100644
--- a/binfilter/bf_svtools/source/config/svt_saveopt.cxx
+++ b/binfilter/bf_svtools/source/config/svt_saveopt.cxx
@@ -115,7 +115,6 @@ public:
 BOOLIsSaveRelINet() const   { return 
bSaveRelINet; }
 BOOLIsSaveRelFSys() const   { return 
bSaveRelFSys; }
 BOOLIsSaveUnpacked() const  { return 
bSaveUnpacked; }
-sal_BoolIsPrettyPrintingEnabled( ) const{ return 
bDoPrettyPrinting; }
 sal_BoolIsWarnAlienFormat() const   { return 
bWarnAlienFormat; }
 sal_BoolIsLoadDocPrinter() const{ return 
bLoadDocPrinter; }
 };
@@ -619,11 +618,6 @@ sal_Bool   SvtSaveOptions::IsLoadUserSettings() const
 return pImp->pLoadOpt->IsLoadUserSettings();
 }
 
-sal_Bool SvtSaveOptions::IsPrettyPrinting() const
-{
-return pImp->pSaveOpt->IsPrettyPrintingEnabled();
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx 
b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
index 0d12b29..74752c9 100644
--- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
@@ -600,22 +600,6 @@ struct OUStringLess
 /*N*/   meCreateMode = eCreateMode;
 /*N*/ }
 
-// 
-
-
-/*N*/ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create(
-/*N*/   SvStorage& rRootStorage,
-/*N*/   SvPersist& rDocPersist,
-/*N*/   SvXMLEmbeddedObjectHelperMode eCreateMode,
-/*N*/   sal_Bool /*bDirect*/ )
-/*N*/ {
-/*N*/   SvXMLEmbeddedObjectHelper* pThis = new SvXMLEmbeddedObjectHelper;
-/*N*/
-/*N*/   pThis->acquire();
-/*N*/   pThis->Init( &rRootStorage, rDocPersist, eCreateMode );
-/*N*/
-/*N*/   return pThis;
-/*N*/ }
-
 /*N*/ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create(
 /*N*/   SvPersist& rDocPersist,
 /*N*/   SvXMLEmbeddedObjectHelperMode eCreateMode )
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx 
b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
index 471fcde..f549b79 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
@@ -561,15 +561,6 @@ void SAL_CALL SdXMLImport::initialize( const 
uno::Sequence< uno::Any >& aArgumen
 
 SdXMLImport::~SdXMLImport() throw ()
 {
-// #80365# removed ending of progress bar here, this was an old implementation
-// and maybe removed on demand
-//  // stop progress view
-//  if(mxStatusIndicator.is())
-//  {
-//  mxStatusIndicator->end();
-//  mxStatusIndicator->reset();
-//  }
-
 // Styles or AutoStyles context?
 if(mpMasterStylesContext)
 mpMasterStylesContext->ReleaseRef();
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfil

[Libreoffice-commits] .: sc/source

2012-04-14 Thread Caolán McNamara

 sc/source/core/data/dpitemdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23067849649518210ee0fdf80fa4b05625f1e6bb
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 14 13:46:07 2012 +0100

valgrind: Conditional jump or move depends on uninitialised value

in ScDPItemData::DisposeString

diff --git a/sc/source/core/data/dpitemdata.cxx 
b/sc/source/core/data/dpitemdata.cxx
index c6fc2dd..83ca357 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -125,7 +125,7 @@ ScDPItemData::ScDPItemData(const rtl::OUString* pStr) :
 mpString(pStr), meType(String), mbStringInterned(true) {}
 
 ScDPItemData::ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue) :
-meType(GroupValue)
+meType(GroupValue), mbStringInterned(false)
 {
 maGroupValue.mnGroupType = nGroupType;
 maGroupValue.mnValue = nValue;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-14 Thread Caolán McNamara

 sfx2/source/doc/objstor.cxx  |2 
 sw/source/core/docnode/ndtbl.cxx |   10 
 sw/source/core/unocore/unotext.cxx   |4 +
 sw/source/core/view/viewsh.cxx   |   32 ---
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 
 writerfilter/source/rtftok/rtftokenizer.cxx  |   10 
 6 files changed, 43 insertions(+), 17 deletions(-)

New commits:
commit 234f150f30d881b2691288c5f5581306bd4d3d18
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 14 12:45:38 2012 +0100

Resolves: fdo#48640 handle various busted rtf docs without hanging

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e42df41..d8406dc 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2236,7 +2236,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, 
bool bInsert )
 }
 
 return xLoader->filter( aArgs );
-}catch(const uno::Exception&)
+}catch(...)
 {}
 }
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 0817150..7be23f3 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1078,8 +1078,16 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& 
rRange, sal_Unicode cCh,
 
 const SwTable* SwDoc::TextToTable( const std::vector< std::vector 
>& rTableNodes )
 {
+if (rTableNodes.empty())
+return NULL;
+
+std::vector rFirstRange = *rTableNodes.begin();
+
+if (rFirstRange.empty())
+return NULL;
+
 /* Save first node in the selection if it is a content node. */
-SwCntntNode * pSttCntntNd = 
rTableNodes.begin()->begin()->aStart.GetNode().GetCntntNode();
+SwCntntNode * pSttCntntNd = 
rFirstRange.begin()->aStart.GetNode().GetCntntNode();
 
 /**debug**/
 #if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 08e6ce5..2334391 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2230,6 +2230,10 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException)
 std::vector aMergedCells;
 
 SwTable const*const pTable = m_pImpl->m_pDoc->TextToTable( aTableNodes );
+
+if (!pTable)
+return uno::Reference< text::XTextTable >();
+
 SwXTextTable *const pTextTable = new SwXTextTable( *pTable->GetFrmFmt() );
 const uno::Reference< text::XTextTable > xRet = pTextTable;
 const uno::Reference< beans::XPropertySet > xPrSet = pTextTable;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 17b48da..89a71f1 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -442,7 +442,7 @@ void DomainMapperTableManager::endOfRowAction()
 double nFullWidth = m_nTableWidth;
 //the positions have to be distibuted in a range of 1
 const double nFullWidthRelative = 1.;
-if( pTableGrid->size() == nGrids )
+if( pTableGrid->size() == nGrids && m_nCell > 0 )
 {
 uno::Sequence< text::TableColumnSeparator > aSeparators( m_nCell - 1 );
 text::TableColumnSeparator* pSeparators = aSeparators.getArray();
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx 
b/writerfilter/source/rtftok/rtftokenizer.cxx
index d6dc3ca..125319e 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -213,6 +213,11 @@ int RTFTokenizer::resolveKeyword()
 {
 aBuf.append(ch);
 Strm() >> ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
 }
 if (aBuf.getLength() > 32)
 // See RTF spec v1.9.1, page 7
@@ -237,6 +242,11 @@ int RTFTokenizer::resolveKeyword()
 {
 aParameter.append(ch);
 Strm() >> ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
 }
 nParam = aParameter.makeStringAndClear().toInt32();
 if (bNeg)
commit 1856186951a70a0bcac4e0c3632ca4afe68c05e3
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 14 07:56:45 2012 +0100

optimize: traverse children with WINDOW_FIRSTCHILD/WINDOW_NEXT

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 774000c..04717dd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -370,25 +370,29 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
 if ( GetWin() )
 {
 Window& rWindow = *(GetWin());
-if(rWindow.IsChildTransparentModeEnabled() && 
rWindow.GetChildCount())
+if (rWindow.IsChildTransparentModeEnabled())
 {
-

[Libreoffice-commits] .: sal/cppunittester

2012-04-13 Thread Caolán McNamara

 sal/cppunittester/cppunittester.cxx |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

New commits:
commit d117d974184e47ba2a5f2c8181207556f19ee5ef
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 13 16:46:53 2012 +0100

push and pop protectors around runner run, hopefully fixes windows build

diff --git a/sal/cppunittester/cppunittester.cxx 
b/sal/cppunittester/cppunittester.cxx
index 22ac029..7886c80 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -119,10 +119,12 @@ private:
 const std::string &testlib;
 const std::string &args;
 CppUnit::TestResult &result;
+std::vector &protectors;
 public:
-ProtectedFixtureFunctor(const std::string& testlib_, const std::string 
&args_, CppUnit::TestResult &result_)
+ProtectedFixtureFunctor(const std::string& testlib_, const std::string 
&args_, std::vector &protectors_, CppUnit::TestResult 
&result_)
 : testlib(testlib_)
 , args(args_)
+, protectors(protectors_)
 , result(result_)
 {
 }
@@ -150,8 +152,14 @@ public:
 result.addListener(&timer);
 #endif
 
+for (size_t i = 0; i < protectors.size(); ++i)
+result.pushProtector(protectors[i]);
+
 runner.run(result);
 
+for (size_t i = 0; i < protectors.size(); ++i)
+result.popProtector();
+
 CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
 return collector.wasSuccessful();
 }
@@ -180,7 +188,7 @@ SAL_IMPLEMENT_MAIN() {
 #endif
 
 boost::ptr_vector modules;
-CppUnit::Protector *throw_protector = 0;
+std::vector protectors;
 CppUnit::TestResult result;
 std::string args;
 std::string testlib;
@@ -218,20 +226,20 @@ SAL_IMPLEMENT_MAIN() {
 rtl::OUString 
sym(RTL_CONSTASCII_USTRINGPARAM("unoexceptionprotector"));
 oslGenericFunction fn = (oslGenericFunction) unoexceptionprotector;
 #endif
-throw_protector = fn == 0
+CppUnit::Protector *protector = fn == 0
 ? 0
 : (*reinterpret_cast< cppunittester::ProtectorFactory * >(fn))();
-if (throw_protector == 0) {
+if (protector == 0) {
 std::cerr
 << "Failure instantiating protector \"" << convertLazy(lib)
 << "\", \"" << convertLazy(sym) << '"' << std::endl;
 std::exit(EXIT_FAILURE);
 }
-result.pushProtector(throw_protector);
+protectors.push_back(protector);
 index+=3;
 }
 
-ProtectedFixtureFunctor tests(testlib, args, result);
+ProtectedFixtureFunctor tests(testlib, args, protectors, result);
 bool ok = tests.run();
 
 return ok ? EXIT_SUCCESS : EXIT_FAILURE;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry

2012-04-13 Thread Caolán McNamara

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 1ad759b17798848b0e4caa2a39c0b292e86efab1
Author: Andras Timar 
Date:   Thu Apr 12 12:55:55 2012 +0200

fdo#48584 Shift+F3 should be the shourtcut for Edit > Duplicate in Draw

... just like it is in Impress. The fix for fdo#32559 was partially
reverted. I think .uno:CopyObjects is more useful in Draw, than
.uno:ChangeCaseRotateCase.
(cherry picked from commit 25c194163c531648f7ad8cdb1a64a03407f75efc)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 30702f9..685b7b4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1131,14 +1131,9 @@
   .uno:LeaveGroup
  
 
-
 
  I10N SHORTCUTS 
- NO TRANSLATE
-  .uno:ChangeCaseRotateCase
+  .uno:CopyObjects
  
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cairo/cairo cairo/cairo-1.10.2.patch clucene/CustomTarget_source.mk clucene/patches filter/source gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch glib/glib-2.28.1-win32.patch hwpfilt

2012-04-13 Thread Caolán McNamara

 RepositoryExternal.mk  |4 
 RepositoryFixes.mk |6 -
 RepositoryModule_ooo.mk|1 
 cairo/cairo-1.10.2.patch   |   44 +
 cairo/cairo/makefile.mk|5 +
 clucene/CustomTarget_source.mk |1 
 clucene/patches/clucene-internal-zlib.patch|   15 +++
 filter/source/flash/swfwriter1.cxx |6 +
 gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch   |2 
 glib/glib-2.28.1-win32.patch   |   24 -
 hwpfilter/source/hgzip.h   |5 +
 hwpfilter/source/hiodev.cxx|5 +
 libgsf/libgsf-1.14.19.windows.patch|4 
 libpng/libpng-1.5.1.patch  |   48 ++
 moz/makefile.mk|6 -
 neon/neon.patch|9 +-
 nss/nss.patch  |   14 +++
 nss/prj/build.lst  |2 
 package/Library_package2.mk|6 +
 package/source/zipapi/Deflater.cxx |4 
 package/source/zipapi/Inflater.cxx |4 
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |4 
 sdext/source/pdfimport/test/tests.cxx  |4 
 sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx   |5 +
 shell/inc/internal/zipfile.hxx |4 
 shell/source/win32/ooofilereader/makefile.mk   |4 
 shell/source/win32/shlxthandler/columninfo/makefile.mk |4 
 shell/source/win32/shlxthandler/infotips/makefile.mk   |4 
 shell/source/win32/shlxthandler/makefile.mk|8 +
 shell/source/win32/shlxthandler/ooofilt/makefile.mk|8 +
 shell/source/win32/shlxthandler/prophdl/makefile.mk|4 
 shell/source/win32/shlxthandler/propsheets/makefile.mk |4 
 shell/source/win32/shlxthandler/util/makefile.mk   |4 
 shell/source/win32/zipfile/makefile.mk |4 
 solenv/inc/libs.mk |6 +
 tools/source/zcodec/zcodec.cxx |6 +
 zlib/CustomTarget_source.mk|   53 
 zlib/Makefile  |   11 --
 zlib/Module_zlib.mk|   36 
 zlib/Package_source.mk |   38 
 zlib/StaticLibrary_zlib.mk |   70 ---
 zlib/make_patched_header.pl|   66 ++
 zlib/makefile.mk   |   75 +
 zlib/patches/minizip-null.patch|   12 --
 zlib/patches/zlib-1.2.5-gentoo.patch   |   12 --
 zlib/patches/zlib-1.2.5-minizip-fixuncrypt.patch   |   14 ---
 zlib/patches/zlib-1.2.5-zip64.patch|   59 -
 zlib/prj/build.lst |5 -
 zlib/prj/d.lst |   11 ++
 zlib/prj/makefile.mk   |1 
 zlib/zlib-1.2.5.patch  |   67 +++
 51 files changed, 485 insertions(+), 333 deletions(-)

New commits:
commit 3934efe28c70b1c21a60f38fe726a935c15f4e99
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 13 14:06:05 2012 +0100

sigh, need a 64bit zlib too on windows, reverting

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c0a3dd2..10dc633 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -90,12 +90,12 @@ endef
 else # !SYSTEM_ZLIB
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-   z \
+   zlib \
 ))
 
 define gb_LinkTarget__use_zlib
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-   z \
+   zlib \
 )
 
 endef
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index d07d791..77c51be 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -54,7 +54,7 @@ gb_Library_DLLFILENAMES := $(patsubst 
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D
 gb_Library_DLLFILENAMES := $(patsubst 
log_uno:log_uno%,log_uno:log_uno_uno%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst z:z%,z:z%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
@@ -74,7 +74,7 @@ gb_Library_FILENAMES :=

[Libreoffice-commits] .: Repository.mk

2012-04-13 Thread Caolán McNamara

 Repository.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit cb5299e5ea3ea46ebdce93c18c20f190a2b7b16e
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 13 13:31:21 2012 +0100

already registered in RepositoryExternal.mk

diff --git a/Repository.mk b/Repository.mk
index 1e42341..52dee49 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -570,7 +570,6 @@ $(eval $(call 
gb_Helper_register_static_libraries,PLAINLIBS, \
 $(if $(filter $(OS),WNT), \
 odma_lib \
 ) \
-   z \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: idlc/source

2012-04-13 Thread Caolán McNamara

 idlc/source/parser.y |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 2273ce95c7a3522757378e96fd65cf380dc790cd
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 13 13:28:22 2012 +0100

WaE: don't seem to need this pragma

diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index bedf2e9..acaf5c1 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -257,9 +257,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration 
const * type2) {
 }
 
 // Suppress any warnings from generated code:
-#if defined __GNUC__
-#pragma GCC system_header
-#elif defined __SUNPRO_CC
+#if defined __SUNPRO_CC
 #pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: idlc/source

2012-04-13 Thread Caolán McNamara

 idlc/source/parser.y |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3c9054eccf01f9d9c59ce1106bfbfd3c7add4f2e
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 13 13:22:44 2012 +0100

WaE: -Werror=parentheses

diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index ec1dfc0..bedf2e9 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -601,7 +601,8 @@ forward_dcl :
{
pForward = new AstInterface(*$1, NULL, pScope);

-   if ( pDecl = 
pScope->lookupByName(pForward->getScopedName()) ) 
+   pDecl = pScope->lookupByName(pForward->getScopedName());
+   if ( pDecl ) 
{
if ( (pDecl != pForward) && 
 (pDecl->getNodeType() == NT_interface) 
)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sd/source

2012-04-12 Thread Caolán McNamara

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab05fbd16e3613494731414276f63b5a03e164e9
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 12 15:11:38 2012 +0100

fix build

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index dcdad2b..9d37e45 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -847,7 +847,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
 pFirstPage = pPage;
 
 aPageStr += " ";
-aPageStr += rtl::OUString::valueOf( nFirstPage + 1 );
+aPageStr += rtl::OUString::valueOf( 
static_cast(nFirstPage + 1) );
 aPageStr += " / " ;
 aPageStr += 
rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount());
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/en

2012-04-12 Thread Caolán McNamara

 dictionaries/en/dictionaries.xcu |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 05f89ef6371a108ebc4e7763541407a2552ab274
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 12 14:49:46 2012 +0100

These countries use British spelling rules

diff --git a/dictionaries/en/dictionaries.xcu b/dictionaries/en/dictionaries.xcu
index 81e7142..5c37803 100644
--- a/dictionaries/en/dictionaries.xcu
+++ b/dictionaries/en/dictionaries.xcu
@@ -10,7 +10,7 @@
 DICT_SPELL
 
 
-en-GB en-IE en-IN
+en-GB en-BS en-BZ en-GH en-IE en-IN en-JM en-NZ 
en-TT
 
 
 
@@ -21,7 +21,7 @@
 DICT_SPELL
 
 
-en-ZA en-NA en-ZW
+en-ZA en-MW en-NA en-ZW
 
 
 
@@ -65,7 +65,7 @@
 DICT_HYPH
 
 
-en-GB en-ZA en-NA en-ZW en-AU en-CA en-IE en-IN en-BZ 
en-BS en-GH en-JM en-NZ en-TT
+en-GB en-ZA en-NA en-ZW en-AU en-CA en-IE en-IN en-BZ 
en-BS en-GH en-JM en-MW en-NZ en-TT
 
 
 
@@ -87,7 +87,7 @@
 DICT_THES
 
 
-en-GB en-US en-PH en-ZA en-NA en-ZW en-AU en-CA en-IE 
en-IN en-BZ en-BS en-GH en-JM en-NZ en-TT
+en-GB en-US en-PH en-ZA en-NA en-ZW en-AU en-CA en-IE 
en-IN en-BZ en-BS en-GH en-JM en-MW en-NZ en-TT
 
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/inc editeng/qa editeng/source test/Library_test.mk test/source

2012-04-12 Thread Caolán McNamara

 editeng/inc/editeng/eerdll.hxx|1 -
 editeng/qa/unit/core-test.cxx |2 +-
 editeng/source/editeng/eerdll.cxx |   19 +--
 test/Library_test.mk  |1 -
 test/source/bootstrapfixture.cxx  |2 --
 5 files changed, 6 insertions(+), 19 deletions(-)

New commits:
commit 43aabb908e3dacd1b1b2effb215b04147de4016e
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 12 13:25:01 2012 +0100

partially revert the editeng singleton stuff to get build to complete

diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 5fd9896..00094cf 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -53,7 +53,6 @@ public:
 ResMgr* GetResMgr() const   { return pResMgr; }
 GlobalEditData* GetGlobalData() const   { return pGlobalData; }
 static EditDLL& Get();
-EDITENG_DLLPUBLIC static void Release();
 };
 
 #define EE_DLL() EditDLL::Get()
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index fc5828f..61db59f 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -55,7 +55,7 @@ public:
 void testConstruction();
 
 CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testConstruction);
+//CPPUNIT_TEST(testConstruction);
 CPPUNIT_TEST_SUITE_END();
 
 private:
diff --git a/editeng/source/editeng/eerdll.cxx 
b/editeng/source/editeng/eerdll.cxx
index ccec18e..1e0f3e4 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -72,27 +72,18 @@
 #include 
 #include 
 #include 
-
-#include 
+#include 
 
 using namespace ::com::sun::star;
 
-namespace {
-
-boost::scoped_ptr pDLL;
-
-}
-
-EditDLL& EditDLL::Get()
+namespace
 {
-if (!pDLL)
-pDLL.reset(new EditDLL);
-return *pDLL;
+class theEditDLL : public rtl::Static {};
 }
 
-void EditDLL::Release()
+EditDLL& EditDLL::Get()
 {
-pDLL.reset();
+return theEditDLL::get();
 }
 
 GlobalEditData::GlobalEditData()
diff --git a/test/Library_test.mk b/test/Library_test.mk
index f66e101..571d26c 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,test,\
 comphelper \
 cppu \
 cppuhelper \
-editeng \
i18nisolang1 \
 sal \
tl \
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index f4b8139..284dbf7 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -42,7 +42,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace ::com::sun::star;
 
@@ -108,7 +107,6 @@ void test::BootstrapFixture::setUp()
 void test::BootstrapFixture::tearDown()
 {
 ucbhelper::ContentBroker::deinitialize();
-EditDLL::Release();
 test::BootstrapFixtureBase::tearDown();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svtools binfilter/inc binfilter/prj

2012-04-12 Thread Caolán McNamara

 binfilter/bf_sd/source/filter/xml/makefile.mk  |   52 --
 binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx  |  396 -
 binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx |2 
 binfilter/bf_sd/util/makefile.mk   |1 
 binfilter/bf_svtools/source/misc/tl_strimp.cxx |   13 
 binfilter/bf_svtools/source/misc/tl_tustring.cxx   |   13 
 binfilter/inc/bf_sd/sdxmlwrp.hxx   |   62 ---
 binfilter/inc/bf_tools/string.hxx  |5 
 binfilter/prj/build.lst|3 
 9 files changed, 17 insertions(+), 530 deletions(-)

New commits:
commit 4aef5125781f62138c63829b5d0c6f28d870671a
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 12 09:36:20 2012 +0100

ditch some unnecessary code

diff --git a/binfilter/bf_sd/source/filter/xml/makefile.mk 
b/binfilter/bf_sd/source/filter/xml/makefile.mk
deleted file mode 100644
index 4073338..000
--- a/binfilter/bf_sd/source/filter/xml/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*
-#
-# 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.
-#
-#*
-
-PRJ=..$/..$/..$/..
-BFPRJ=..$/..$/..
-
-PRJNAME=binfilter
-TARGET=sd_xml
-
-NO_HIDS=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(BFPRJ)$/util$/makefile.pmk
-INC+= -I$(PRJ)$/inc$/bf_sd
-
-# --- Files 
-
-SLOFILES = \
-$(SLO)$/sd_sdxmlwrp.obj
-
-# --- Targets --
-
-.INCLUDE : target.mk
-
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx 
b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
deleted file mode 100644
index 2e328ce..000
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ /dev/null
@@ -1,396 +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.
- *
- /
-
-#include 
-#include 
-
-#include 
-#include 
-#include "drawdoc.hxx"
-#include 
-#include 
-
-#include "bf_sd/docshell.hxx"
-#include "sdxmlwrp.hxx"
-#include "strmname.h"
-
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include 
-
-// #80365# include necessary for XML progress bar at load time
-#include 
-
-#include 
-
-#include "sderror.hxx"
-#include "sdresid.hxx"
-#include "glob.hrc"
-
-#include 
-namespace binfilter {
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::document;
-using namespace comphelper;
-
-using rtl::OUString;
-
-#define SD_XML_READERROR 1234
-
-

[Libreoffice-commits] .: 2 commits - connectivity/source i18npool/qa i18npool/source oox/inc oox/source sc/source slideshow/source svtools/inc svtools/source unusedcode.easy

2012-04-12 Thread Caolán McNamara

 connectivity/source/commontools/dbexception.cxx |4 
 i18npool/qa/cppunit/test_breakiterator.cxx  |   73 ++---
 i18npool/source/breakiterator/data/char.txt |7 -
 i18npool/source/breakiterator/data/char_in.txt  |7 -
 oox/inc/oox/dump/dumperbase.hxx |8 -
 oox/source/dump/dumperbase.cxx  |   28 --
 sc/source/filter/oox/workbookhelper.cxx |8 -
 slideshow/source/engine/animationnodes/basenode.cxx |8 -
 slideshow/source/engine/animationnodes/basenode.hxx |1 
 svtools/inc/svtools/scrwin.hxx  |1 
 svtools/source/control/scrwin.cxx   |   83 
 unusedcode.easy |   10 +-
 12 files changed, 74 insertions(+), 164 deletions(-)

New commits:
commit be3ee9c889f4240848a3f232f2b3009ea647fefc
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 12 09:45:52 2012 +0100

callcatcher: update unused code list

diff --git a/connectivity/source/commontools/dbexception.cxx 
b/connectivity/source/commontools/dbexception.cxx
index b4e862f..37fbb2a 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -437,11 +437,9 @@ void throwFunctionNotSupportedException( const sal_Char* 
_pAsciiFunctionName, co
 STR_UNSUPPORTED_FUNCTION,
 "$functionname$", ::rtl::OUString::createFromAscii( 
_pAsciiFunctionName )
  ) );
-throw SQLException(
+throwFunctionNotSupportedException(
 sError,
 _rxContext,
-getStandardSQLState( SQL_FUNCTION_NOT_SUPPORTED ),
-0,
 _pNextException ? *_pNextException : Any()
 );
 }
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 10b1e11..10995ef 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -380,9 +380,6 @@ public:
 static void appendAddrName( ::rtl::OUStringBuffer& rStr, 
sal_Unicode cPrefix, sal_Int32 nColRow, bool bRel );
 
 static void appendAddress( ::rtl::OUStringBuffer& rStr, const 
Address& rPos );
-static void appendRange( ::rtl::OUStringBuffer& rStr, const Range& 
rRange );
-
-static void appendAddress( ::rtl::OUStringBuffer& rStr, const 
TokenAddress& rPos, bool bR1C1 );
 
 // encoded text output 
 
@@ -1848,11 +1845,6 @@ protected:
 const ::rtl::OUString& rSysFileName,
 const String& rRecNames,
 const String& rSimpleRecs = EMPTY_STRING );
-voidconstruct(
-const OutputObjectBase& rParent,
-const BinaryInputStreamRef& rxBaseStrm,
-const String& rRecNames,
-const String& rSimpleRecs = EMPTY_STRING );
 
 virtual boolimplStartRecord( BinaryInputStream& rBaseStrm, 
sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize );
 virtual boolimplReadRecordHeader( BinaryInputStream& rBaseStrm, 
sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 62a6d4c..d7cc27d 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -504,27 +504,6 @@ void StringHelper::appendAddress( OUStringBuffer& rStr, 
const Address& rPos )
 appendAddrRow( rStr, rPos.mnRow, true );
 }
 
-void StringHelper::appendRange( OUStringBuffer& rStr, const Range& rRange )
-{
-appendAddress( rStr, rRange.maFirst );
-rStr.append( OOX_DUMP_RANGESEP );
-appendAddress( rStr, rRange.maLast );
-}
-
-void StringHelper::appendAddress( OUStringBuffer& rStr, const TokenAddress& 
rPos, bool bR1C1 )
-{
-if( bR1C1 && (rPos.mbRelCol || rPos.mbRelRow) )
-{
-appendAddrName( rStr, OOX_DUMP_R1C1ROW, rPos.mnRow, rPos.mbRelRow );
-appendAddrName( rStr, OOX_DUMP_R1C1COL, rPos.mnCol, rPos.mbRelCol );
-}
-else
-{
-appendAddrCol( rStr, rPos.mnCol, rPos.mbRelCol );
-appendAddrRow( rStr, rPos.mnRow, rPos.mbRelRow );
-}
-}
-
 // encoded text output 
 
 void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool 
bPrefix )
@@ -2695,13 +2674,6 @@ void SequenceRecordObjectBase::construct( const 
ObjectBase& rParent,
 RecordObjectBase::construct( rParent, rxBaseStrm, rSysFileName, xRecStrm, 
rRecNames, rSimpleRecs );
 }
 
-void SequenceRecordObjectBase::construct( const OutputObjectBase& rParent,
-const BinaryInputStreamRef& rxBaseStrm, const String& rRecNames, const 
String& rSimpleRecs )
-{
-BinaryInputStreamRef xRecStrm( new SequenceInputStream( *mxRecData ) );
-RecordObjectBase::construct( rParent, rxBaseStrm, xRecStrm, rRecNames, 
rSimpleRecs );
-}
-

[Libreoffice-commits] .: editeng/CppunitTest_editeng_core.mk editeng/qa

2012-04-11 Thread Caolán McNamara

 editeng/CppunitTest_editeng_core.mk |2 ++
 editeng/qa/unit/core-test.cxx   |7 ---
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 6089be1a7a17ae849d8793520e9d8d36296ed5cf
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 11 21:22:30 2012 +0100

needs ure and base-class setUp does necessary stuff

diff --git a/editeng/CppunitTest_editeng_core.mk 
b/editeng/CppunitTest_editeng_core.mk
index fb14e16..77e203d 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -72,6 +72,8 @@ $(eval $(call gb_CppunitTest_use_api,editeng_core,\
 udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_use_ure,editeng_core))
+
 $(eval $(call gb_CppunitTest_use_components,editeng_core,\
 configmgr/source/configmgr \
 framework/util/fwk \
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 43e668c..d631923 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -108,9 +108,6 @@ class Test : public test::BootstrapFixture
 public:
 Test();
 
-virtual void setUp();
-virtual void tearDown();
-
 void testConstruction();
 
 CPPUNIT_TEST_SUITE(Test);
@@ -120,10 +117,6 @@ public:
 
 Test::Test() {}
 
-void Test::setUp() {}
-
-void Test::tearDown() {}
-
 void Test::testConstruction()
 {
 TestPool aPool;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin

2012-04-11 Thread Caolán McNamara

 solenv/bin/modules/installer/windows/property.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e83ae5b4cb52845231489d2f0d9bc380f0522be
Author: Andras Timar 
Date:   Wed Apr 11 16:01:06 2012 +0200

set correct value of FINDPRODUCT property
(cherry picked from commit ee7084c4f720c932df67c8ff033dab4d8d556179)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 1e6e921..7113a01 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -256,9 +256,9 @@ sub set_important_properties
 push(@{$propertyfile}, $onepropertyline);
 }
 
-if (( $allvariables->{'PRODUCTNAME'} ) && ( 
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'MANUFACTURER'} ) && ( 
$allvariables->{'PRODUCTCODE'} ))
+if (( $allvariables->{'PRODUCTNAME'} ) && ( 
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'REGISTRYLAYERNAME'} ))
 {
-my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\" . 
$allvariables->{'MANUFACTURER'} . "\\" . $allvariables->{'PRODUCTNAME'} . 
$allvariables->{'PRODUCTADDON'} . "\\" . $allvariables->{'PRODUCTVERSION'} . 
"\\" . $allvariables->{'PRODUCTCODE'} . "\n";
+my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\LibreOffice" . 
"\\" . $allvariables->{'REGISTRYLAYERNAME'} . "\\" . 
$allvariables->{'PRODUCTNAME'} . "\\" . $allvariables->{'PRODUCTVERSION'} . 
"\n";
 push(@{$propertyfile}, $onepropertyline);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 12 commits - sd/inc sd/source

2012-04-11 Thread Caolán McNamara

 sd/inc/sdabstdlg.hxx   |4 
 sd/source/core/drawdoc3.cxx|  179 +++--
 sd/source/ui/dlg/inspagob.cxx  |   20 
 sd/source/ui/dlg/sddlgfact.cxx |6 +
 sd/source/ui/dlg/sddlgfact.hxx |1 
 sd/source/ui/dlg/sdtreelb.cxx  |   15 +++
 sd/source/ui/inc/View.hxx  |   15 +++
 sd/source/ui/inc/inspagob.hxx  |   11 ++
 sd/source/ui/inc/sdtreelb.hxx  |   11 ++
 sd/source/ui/view/sdview2.cxx  |   62 ++
 10 files changed, 213 insertions(+), 111 deletions(-)

New commits:
commit 09fa378e11cec924f9cd2b95d0eedb2599fa088e
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 11 16:14:08 2012 +0100

this can be a reference surely

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index fe6b48a..91a0570 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -336,12 +336,12 @@ void SdDrawDocument::IterateBookmarkPages( 
SdDrawDocument* pBookmarkDoc, List* p
 class InsertBookmarkAsPage_FindDuplicateLayouts : public 
SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase
 {
 public:
-InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
*pLayoutsToTransfer )
-: mpLayoutsToTransfer(pLayoutsToTransfer) {}
+InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
&rLayoutsToTransfer )
+: mrLayoutsToTransfer(rLayoutsToTransfer) {}
 virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {};
 virtual void operator()( SdDrawDocument&, SdPage* );
 private:
-std::vector *mpLayoutsToTransfer;
+std::vector &mrLayoutsToTransfer;
 };
 
 void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& 
rDoc, SdPage* pBMMPage )
@@ -355,9 +355,9 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( 
SdDrawDocument& rDoc
 rtl::OUString aLayout(aFullNameLayout);
 
 std::vector::const_iterator pIter =
-
find(mpLayoutsToTransfer->begin(),mpLayoutsToTransfer->end(),aLayout);
+find(mrLayoutsToTransfer.begin(), 
mrLayoutsToTransfer.end(),aLayout);
 
-bool bFound = pIter != mpLayoutsToTransfer->end();
+bool bFound = pIter != mrLayoutsToTransfer.end();
 
 const sal_uInt16 nMPageCount = rDoc.GetMasterPageCount();
 for (sal_uInt16 nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++)
@@ -376,7 +376,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( 
SdDrawDocument& rDoc
 }
 
 if (!bFound)
-mpLayoutsToTransfer->push_back(aLayout);
+mrLayoutsToTransfer.push_back(aLayout);
 }
 
 /** Just add one page to the container given to the constructor.
@@ -514,7 +514,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 // Refactored copy'n'pasted layout name collection into 
IterateBookmarkPages
 //
 std::vector aLayoutsToTransfer;
-InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
&aLayoutsToTransfer );
+InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
aLayoutsToTransfer );
 IterateBookmarkPages( pBookmarkDoc, pBookmarkList, nBMSdPageCount, 
aSearchFunctor );
 
 
commit 5c3b81d21d163d89ea95c2ca0c23b467b6537025
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 11 16:07:00 2012 +0100

drop unused members

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 0ec3a1e..fe6b48a 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -336,18 +336,12 @@ void SdDrawDocument::IterateBookmarkPages( 
SdDrawDocument* pBookmarkDoc, List* p
 class InsertBookmarkAsPage_FindDuplicateLayouts : public 
SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase
 {
 public:
-InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
*pLayoutsToTransfer,
-   SdDrawDocument* pBookmarkDoc,
-   List* pBookmarkList, sal_uInt16 
nBMSdPageCount ) :
-mpLayoutsToTransfer(pLayoutsToTransfer), mpBookmarkDoc(pBookmarkDoc),
-mpBookmarkList(pBookmarkList), mnBMSdPageCount(nBMSdPageCount) {}
+InsertBookmarkAsPage_FindDuplicateLayouts( std::vector 
*pLayoutsToTransfer )
+: mpLayoutsToTransfer(pLayoutsToTransfer) {}
 virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {};
 virtual void operator()( SdDrawDocument&, SdPage* );
 private:
 std::vector *mpLayoutsToTransfer;
-SdDrawDocument* mpBookmarkDoc;
-List*   mpBookmarkList;
-sal_uInt16  mnBMSdPageCount;
 };
 
 void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& 
rDoc, SdPage* pBMMPage )
@@ -520,8 +514,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 // Refactored copy'n'pasted layout name collection into 
IterateBookmarkPages
 //
 std::vector aLayoutsToTransfer;
-InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
&aLayoutsToTransfer, pBookmarkDoc,
-  pBookmarkList, 
nBMSdPageCount );
+InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( 
&aLayoutsToT

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/inc_ooohelppack solenv/bin

2012-04-11 Thread Caolán McNamara

 instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt |7 
+++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt |7 
+++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt |3 +++
 solenv/bin/make_installer.pl|4 
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 3bb382338859eb278e4baca574ad613b348cb077
Author: Andras Timar 
Date:   Tue Apr 10 20:45:46 2012 +0200

fdo#48411 Find install location during help pack install
(cherry picked from commit da2ec9aac3699c951c544a51acd6ab3aede706eb)

Signed-off-by: CaolÃ¡n McNamara 

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
new file mode 100644
index 000..85e9539
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
@@ -0,0 +1,7 @@
+Property   Signature_
+s72s72
+AppSearch  PropertySignature_
+INSTALLLOCATIONinstalluser
+INSTALLLOCATIONinstallmachine
+INSTALLLOCATIONinstalluserdev
+INSTALLLOCATIONinstallmachinedev
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
new file mode 100644
index 000..8a15810
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
@@ -0,0 +1,7 @@
+Signature_ RootKey NameType
+s72i2  s255S255I2
+RegLocator Signature_
+installuser1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
+installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
+installuserdev 1   
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
+installmachinedev  2   
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
new file mode 100644
index 000..5004a55
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
@@ -0,0 +1,3 @@
+Signature  FileNameMinVersion  MaxVersion  MinSize MaxSize 
MinDate MaxDate Languages
+s72s255S20 S20 I4  I4  I4  I4  S255
+Signature  Signature
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e427cd5..164e08f 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2142,10 +2142,6 @@ for ( my $n = 0; $n <= 
$#installer::globals::languageproducts; $n++ )
 # adding the files from the binary directory into the binary table
 installer::windows::binary::update_binary_table($languageidtdir, 
$filesinproductlanguageresolvedarrayref, $binarytablefiles);
 
-# setting patch codes to detect installed products
-
-if (( $installer::globals::patch ) || ( 
$installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( 
$allvariableshashref->{'PDFCONVERTER'} )) { 
installer::windows::patch::update_patch_tables($languageidtdir, 
$allvariableshashref); }
-
 # Adding Windows Installer CustomActions
 
 installer::windows::idtglobal::addcustomactions($languageidtdir, 
$windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);
___
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 - writerfilter/source

2012-04-11 Thread Caolán McNamara

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |  122 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 +
 2 files changed, 127 insertions(+), 1 deletion(-)

New commits:
commit 586d6a57564c4c75c6464ec91c6f676aa66b0638
Author: Miklos Vajna 
Date:   Wed Apr 11 11:53:05 2012 +0200

fdo#47107 rtftok: support bullet points in paragraph numberings

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8e0cbce..04160e6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -921,6 +921,7 @@ void RTFDocumentImpl::text(OUString& rString)
 case DESTINATION_ANNOTATIONAUTHOR:
 case DESTINATION_FALT:
 case DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER:
+case DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE:
 m_aStates.top().aDestinationText.append(rString);
 break;
 case DESTINATION_EQINSTRUCTION:
@@ -1349,6 +1350,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 case RTF_PNTXTA:
 m_aStates.top().nDestinationState = 
DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER;
 break;
+case RTF_PNTXTB:
+m_aStates.top().nDestinationState = 
DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE;
+break;
 default:
 #if OSL_DEBUG_LEVEL > 1
 OSL_TRACE("%s: TODO handle destination '%s'", OSL_THIS_FUNC, 
lcl_RtfToString(nKeyword));
@@ -2089,6 +2093,12 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 
m_aStates.top().aTableSprms->push_back(make_pair(NS_rtf::LN_NFC, pValue));
 }
 break;
+case RTF_PNLVLBLT:
+{
+
m_aStates.top().aTableAttributes->push_back(make_pair(NS_rtf::LN_LSID, 
RTFValue::Pointer_t(new RTFValue(1;
+
m_aStates.top().aTableSprms->push_back(make_pair(NS_rtf::LN_NFC, 
RTFValue::Pointer_t(new RTFValue(23; // bullets, same as \levelnfc23
+}
+break;
 default:
 #if OSL_DEBUG_LEVEL > 1
 OSL_TRACE("%s: TODO handle flag '%s'", OSL_THIS_FUNC, 
lcl_RtfToString(nKeyword));
@@ -2744,6 +2754,13 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_PNSTART:
 
m_aStates.top().aTableSprms->push_back(make_pair(NS_rtf::LN_ISTARTAT, 
pIntValue));
 break;
+case RTF_PNF:
+{
+int nFontIndex = getFontIndex(nParam);
+RTFValue::Pointer_t pValue(new RTFValue(nFontIndex));
+lcl_putNestedSprm(m_aStates.top().aTableSprms, 
NS_ooxml::LN_CT_Lvl_rPr, NS_sprm::LN_CRgFtc0, pValue);
+}
+break;
 default:
 #if OSL_DEBUG_LEVEL > 1
 OSL_TRACE("%s: TODO handle value '%s'", OSL_THIS_FUNC, 
lcl_RtfToString(nKeyword));
@@ -3352,8 +3369,12 @@ int RTFDocumentImpl::popState()
 {
 // Abstract numbering
 RTFSprms aLeveltextAttributes;
-OUString aTextValue(RTL_CONSTASCII_USTRINGPARAM("%1"));
-RTFValue::Pointer_t pTextAfter = 
aState.aTableAttributes.find(NS_ooxml::LN_CT_LevelText_val);
+OUString aTextValue;
+RTFValue::Pointer_t pTextBefore = 
aState.aTableAttributes.find(NS_ooxml::LN_CT_LevelText_val);
+if (pTextBefore.get())
+aTextValue += pTextBefore->getString();
+aTextValue += OUString(RTL_CONSTASCII_USTRINGPARAM("%1"));
+RTFValue::Pointer_t pTextAfter = 
aState.aTableAttributes.find(NS_ooxml::LN_CT_LevelSuffix_val);
 if (pTextAfter.get())
 aTextValue += pTextAfter->getString();
 RTFValue::Pointer_t pTextValue(new RTFValue(aTextValue));
@@ -3374,6 +3395,9 @@ int RTFDocumentImpl::popState()
 
 RTFValue::Pointer_t pLeveltextValue(new 
RTFValue(aLeveltextAttributes));
 aLevelSprms->push_back(make_pair(NS_ooxml::LN_CT_Lvl_lvlText, 
pLeveltextValue));
+RTFValue::Pointer_t pRunProps = 
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_rPr);
+if (pRunProps.get())
+aLevelSprms->push_back(make_pair(NS_ooxml::LN_CT_Lvl_rPr, 
pRunProps));
 
 RTFSprms aAbstractAttributes;
 RTFSprms aAbstractSprms;
@@ -3410,6 +3434,11 @@ int RTFDocumentImpl::popState()
 else if (aState.nDestinationState == 
DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER)
 {
 RTFValue::Pointer_t pValue(new 
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
+
m_aStates.top().aTableAttributes->push_back(make_pair(NS_ooxml::LN_CT_LevelSuffix_val,
 pValue));
+}
+else if (aState.nDestinationState == 
DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE)
+{
+RTFValue::Pointer_t pValue(new 
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
 
m_aStates.top().aTableAttribut

[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc

2012-04-11 Thread Caolán McNamara

 binfilter/bf_svtools/source/misc/tl_strimp.cxx   |  108 ---
 binfilter/bf_svtools/source/misc/tl_tustring.cxx |  104 ++
 binfilter/inc/bf_tools/string.hxx|2 
 3 files changed, 104 insertions(+), 110 deletions(-)

New commits:
commit 61eb8ffd6f6e47f4c539b1cfbefba12cf5e650a9
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 11 10:09:05 2012 +0100

callcatcher: reduce ByteString

diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx 
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 7b82b64..36111fd 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -451,67 +451,6 @@ STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex )
 
 // ---
 
-STRING& STRING::Replace( xub_StrLen nIndex, xub_StrLen nCount, const STRING& 
rStr )
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
-
-// Wenn Index groessergleich Laenge ist, dann ist es ein Append
-if ( nIndex >= mpData->mnLen )
-{
-Append( rStr );
-return *this;
-}
-
-// Ist es eine Zuweisung
-if ( (nIndex == 0) && (nCount >= mpData->mnLen) )
-{
-Assign( rStr );
-return *this;
-}
-
-// Reicht ein Erase
-sal_Int32 nStrLen = rStr.mpData->mnLen;
-if ( !nStrLen )
-return Erase( nIndex, nCount );
-
-// nCount darf nicht ueber das Stringende hinnausgehen
-if ( nCount > mpData->mnLen - nIndex )
-nCount = static_cast< xub_StrLen >(mpData->mnLen-nIndex);
-
-// Reicht ein Insert
-if ( !nCount )
-return Insert( rStr, nIndex );
-
-// Reicht eine zeichenweise Zuweisung
-if ( nCount == nStrLen )
-{
-ImplCopyData();
-memcpy( mpData->maStr+nIndex, rStr.mpData->maStr, nCount*sizeof( 
STRCODE ) );
-return *this;
-}
-
-// Ueberlauf abfangen
-nStrLen = ImplGetCopyLen( mpData->mnLen-nCount, nStrLen );
-
-// Neue Daten anlegen
-STRINGDATA* pNewData = ImplAllocData( mpData->mnLen-nCount+nStrLen );
-
-// String kopieren
-memcpy( pNewData->maStr, mpData->maStr, nIndex*sizeof( STRCODE ) );
-memcpy( pNewData->maStr+nIndex, rStr.mpData->maStr, nStrLen*sizeof( 
STRCODE ) );
-memcpy( pNewData->maStr+nIndex+nStrLen, mpData->maStr+nIndex+nCount,
-(mpData->mnLen-nIndex-nCount+1)*sizeof( STRCODE ) );
-
-// Alte Daten loeschen und Neue zuweisen
-STRING_RELEASE((STRING_TYPE *)mpData);
-mpData = pNewData;
-
-return *this;
-}
-
-// ---
-
 STRING& STRING::Erase( xub_StrLen nIndex, xub_StrLen nCount )
 {
 DBG_CHKTHIS( STRING, DBGCHECKSTRING );
@@ -614,53 +553,6 @@ xub_StrLen STRING::Search( STRCODE c, xub_StrLen nIndex ) 
const
 
 // ---
 
-xub_StrLen STRING::Search( const STRING& rStr, xub_StrLen nIndex ) const
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
-
-sal_Int32 nLen = mpData->mnLen;
-sal_Int32 nStrLen = rStr.mpData->mnLen;
-
-// Falls die Laenge des uebergebenen Strings 0 ist oder der Index
-// hinter dem String liegt, dann wurde der String nicht gefunden
-if ( !nStrLen || (nIndex >= nLen) )
-return STRING_NOTFOUND;
-
-const STRCODE* pStr1 = mpData->maStr;
-pStr1 += nIndex;
-
-if ( nStrLen == 1 )
-{
-STRCODE cSearch = rStr.mpData->maStr[0];
-while ( nIndex < nLen )
-{
-if ( *pStr1 == cSearch )
-return nIndex;
-++pStr1,
-++nIndex;
-}
-}
-else
-{
-const STRCODE* pStr2 = rStr.mpData->maStr;
-
-// Nur innerhalb des Strings suchen
-while ( nLen - nIndex >= nStrLen )
-{
-// Stimmt der String ueberein
-if ( ImplStringCompareWithoutZero( pStr1, pStr2, nStrLen ) == 0 )
-return nIndex;
-++pStr1,
-++nIndex;
-}
-}
-
-return STRING_NOTFOUND;
-}
-
-// ---
-
 xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const
 {
 DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx 
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index eb29ea1..0e60670 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -1139,6 +1139,110 @@ xub_StrLen STRING::SearchAndReplace( const STRING& 
rStr, const STRING& rRepStr,
 return nSPos;
 }
 
+STRING& STRING::Replace( xub_StrLen nIndex, xub_StrLen nCount, const STRING& 
rStr )
+{
+DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING );
+
+// Wenn Index groes

[Libreoffice-commits] .: 5 commits - basctl/source boost/boost.6369.warnings.patch clucene/Package_source.mk cui/source oox/inc oox/source reportdesign/source sc/inc sc/source sd/source slideshow/qa s

2012-04-11 Thread Caolán McNamara

 basctl/source/basicide/linenumberwindow.cxx  |4 
 boost/boost.6369.warnings.patch  |   18 +
 clucene/Package_source.mk|  182 +--
 cui/source/options/optlingu.cxx  |6 
 oox/inc/oox/dump/dumperbase.hxx  |2 
 oox/source/dump/dumperbase.cxx   |   19 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx |2 
 sc/inc/dbdata.hxx|1 
 sc/source/core/tool/dbdata.cxx   |   16 -
 sc/source/core/tool/interpr1.cxx |2 
 sc/source/filter/excel/xiescher.cxx  |6 
 sc/source/filter/inc/pivotcachebuffer.hxx|2 
 sc/source/filter/inc/stylesbuffer.hxx|5 
 sc/source/filter/oox/pivotcachebuffer.cxx|8 
 sc/source/filter/oox/stylesbuffer.cxx|   35 ---
 sc/source/filter/oox/workbookhelper.cxx  |8 
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx |   13 -
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx |8 
 slideshow/qa/debug/nodetree.sh   |2 
 slideshow/source/engine/animationnodes/nodetools.cxx |8 
 slideshow/source/engine/animationnodes/nodetools.hxx |3 
 svl/inc/svl/style.hxx|2 
 svl/source/items/intitem.cxx |2 
 svl/source/items/style.cxx   |4 
 svtools/source/uno/wizard/wizardshell.cxx|2 
 sw/inc/docstyle.hxx  |2 
 sw/source/ui/app/docstyle.cxx|6 
 unusedcode.easy  |   53 +
 28 files changed, 179 insertions(+), 242 deletions(-)

New commits:
commit bb7d331ecdb3a0a4723f770a9f891c00f4a25dbf
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 11 10:08:16 2012 +0100

callcatcher: update list

diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index fb1ede5..10b1e11 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -381,10 +381,8 @@ public:
 
 static void appendAddress( ::rtl::OUStringBuffer& rStr, const 
Address& rPos );
 static void appendRange( ::rtl::OUStringBuffer& rStr, const Range& 
rRange );
-static void appendRangeList( ::rtl::OUStringBuffer& rStr, const 
RangeList& rRanges );
 
 static void appendAddress( ::rtl::OUStringBuffer& rStr, const 
TokenAddress& rPos, bool bR1C1 );
-static void appendRange( ::rtl::OUStringBuffer& rStr, const 
TokenRange& rRange, bool bR1C1 );
 
 // encoded text output 
 
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 0d8039d..62a6d4c 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -511,18 +511,6 @@ void StringHelper::appendRange( OUStringBuffer& rStr, 
const Range& rRange )
 appendAddress( rStr, rRange.maLast );
 }
 
-void StringHelper::appendRangeList( OUStringBuffer& rStr, const RangeList& 
rRanges )
-{
-OUStringBuffer aData;
-for( RangeList::const_iterator aIt = rRanges.begin(), aEnd = 
rRanges.end(); aIt != aEnd; ++aIt )
-{
-OUStringBuffer aRange;
-appendRange( aRange, *aIt );
-appendToken( aData, aRange.makeStringAndClear(), OOX_DUMP_LISTSEP );
-}
-rStr.append( aData.makeStringAndClear() );
-}
-
 void StringHelper::appendAddress( OUStringBuffer& rStr, const TokenAddress& 
rPos, bool bR1C1 )
 {
 if( bR1C1 && (rPos.mbRelCol || rPos.mbRelRow) )
@@ -537,13 +525,6 @@ void StringHelper::appendAddress( OUStringBuffer& rStr, 
const TokenAddress& rPos
 }
 }
 
-void StringHelper::appendRange( OUStringBuffer& rStr, const TokenRange& 
rRange, bool bR1C1 )
-{
-appendAddress( rStr, rRange.maFirst, bR1C1 );
-rStr.append( OOX_DUMP_RANGESEP );
-appendAddress( rStr, rRange.maLast, bR1C1 );
-}
-
 // encoded text output 
 
 void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool 
bPrefix )
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index cef02e1..9dcd457 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -243,7 +243,6 @@ public:
 ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool 
bStartOnly);
 const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2) const;
 ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2);
-const ScDBData* GetFilterDBAtTable(SCTAB nTab) const;
 ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
 
 voidDeleteOnTab( SCTAB nTab );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 4c14735..36d1914 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/so

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 3 commits - scp2/source vcl/inc vcl/qa vcl/source

2012-04-11 Thread Caolán McNamara

 scp2/source/ooo/file_ooo.scp  |   11 ++
 scp2/source/ooo/module_hidden_ooo.scp |1 
 vcl/inc/vcl/layout.hxx|   20 +++--
 vcl/qa/cppunit/builder/demo.ui|  125 +++---
 vcl/source/window/builder.cxx |   15 
 vcl/source/window/layout.cxx  |   91 +---
 6 files changed, 175 insertions(+), 88 deletions(-)

New commits:
commit 0d705463411ed1a5139a1f609cd276a353d1a9de
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 11 11:45:33 2012 +0100

add a GtkFrame to the demo

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index ed75074..c8dc618 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -51,69 +51,92 @@
   
 
 
-  
+  
 True
 False
-vertical
-6
-True
+0
+none
 
-  
+  
 True
 False
-0
-left
+12
+
+  
+True
+False
+vertical
+6
+True
+
+  
+True
+False
+0
+left
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+1
+right
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+center
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+True
+â
+an edit 
control
+True
+  
+  
+False
+True
+3
+  
+
+  
+
   
-  
-False
-True
-0
-  
 
-
-  
+
+  
 True
 False
-1
-right
+Frame 
Label
+True
   
-  
-False
-True
-1
-  
-
-
-  
-True
-False
-center
-  
-  
-False
-True
-2
-  
-
-
-  
-True
-True
-â
-an edit 
control
-True
-  
-  
-False
-True
-3
-  
 
   
   
 False
 True
-2
+1
   
 
 
@@ -309,12 +332,6 @@
 
   
 
-
-  
-
-
-  
-
   
   
 True
commit 5c3a8d8fb299d106332cb925d462aaae08586a11
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 11 11:41:54 2012 +0100

implement a basic VclFrame

factor out common VclContainer pieces

diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index fc7e0a1..cff021f 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -36,6 +36,9 @@ class VCL_DLLPUBLIC VclContainer : public Window
 {
 public:
 VclContainer(Window *pParent) : Window(pParent) {}
+virtual Size GetOptimalSize(WindowSizeType eType) const;
+using Window::SetPosSizePixel;
+virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
 protected:
 virtual Size calculateRequisition() const = 0;
 virtual void setAllocation(const Size &rAllocation) = 0;
@@ -60,10 +63,6 @@ public:
 {
 Show();
 }
-public:
-virtual Size GetOptimalSize(WindowSizeType eType) const;
-using Window::SetPosSizePixel;
-virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSi

[Libreoffice-commits] .: python/makefile.mk

2012-04-10 Thread Caolán McNamara

 python/makefile.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e6d4795e52643a8e940f79c1ee6510cc14fdfb38
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 10 16:45:48 2012 +0100

extra love for incompatible expat on macosx

diff --git a/python/makefile.mk b/python/makefile.mk
index e66acb7..5043b28 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -65,10 +65,12 @@ CONFIGURE_DIR=
 BUILD_DIR=
 MYCWD=$(shell @pwd)/$(INPATH)/misc/build
 
+.IF "$(SYSTEM_OPENSSL)" != "YES"
 #we want to be sure we use our internal openssl if
 #that's enabled
 CC+:=-I$(SOLARINCDIR)$/external
 python_LDFLAGS+=-L$(SOLARLIBDIR)
+.ENDIF
 
 # CLFLAGS get overwritten in Makefile.pre.in
 .IF "$(SYSBASE)"!=""
___
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

2012-04-10 Thread Caolán McNamara

 sysui/desktop/productversion.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 58e524761aabb4bfc214e0375aaa4ec94b3e8903
Author: Petr Mladek 
Date:   Tue Apr 10 16:25:19 2012 +0200

use x.y.z version also for desktop integration packages (fdo#47840)

This version scheme is used for other packages as well. It is important for
the desktop integration packages now because we started reseting buildid for
each bugfix release (fdo#47840). This value is used also for the release
number of Linux packages.
(cherry picked from commit 4045e770193ae632aca7075105dda89686c597d6)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 398241d..5a186bc 100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -45,7 +45,8 @@ PKGDIR=$(BIN)
 
 .INCLUDE : productversion.mk
 
-PKGVERSION = $(PRODUCTVERSION)
+PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO)
+
 # gnome-vfs treats everything behind the last '.' as an icon extension, 
 # even though the "icon_filename" in '.keys' is specified as filename 
 # without extension. Since it also does not know how to handle "2-writer"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: python/makefile.mk

2012-04-10 Thread Caolán McNamara

 python/makefile.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit b773045fa0470776e37731d5bb9805bfb0cc4a7e
Author: Laurent Godard 
Date:   Tue Apr 10 16:07:47 2012 +0100

to find the headers and (static) library of our internal openssl

diff --git a/python/makefile.mk b/python/makefile.mk
index 3f35d4c..e66acb7 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -65,6 +65,11 @@ CONFIGURE_DIR=
 BUILD_DIR=
 MYCWD=$(shell @pwd)/$(INPATH)/misc/build
 
+#we want to be sure we use our internal openssl if
+#that's enabled
+CC+:=-I$(SOLARINCDIR)$/external
+python_LDFLAGS+=-L$(SOLARLIBDIR)
+
 # CLFLAGS get overwritten in Makefile.pre.in
 .IF "$(SYSBASE)"!=""
 CC+:=-I$(SYSBASE)$/usr$/include
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: canvas/inc canvas/source unusedcode.easy

2012-04-10 Thread Caolán McNamara

 canvas/inc/canvas/parametricpolypolygon.hxx   |6 --
 canvas/source/tools/parametricpolypolygon.cxx |   15 ---
 unusedcode.easy   |1 -
 3 files changed, 22 deletions(-)

New commits:
commit c73f01822c40d8b7c928e3d6fd0729805cf58c07
Author: GÃ¡bor Stefanik 
Date:   Sat Apr 7 21:18:39 2012 +0200

Remove unused constructor for ParametricPolyPolygon

diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx 
b/canvas/inc/canvas/parametricpolypolygon.hxx
index d1f2d81..16a6916 100644
--- a/canvas/inc/canvas/parametricpolypolygon.hxx
+++ b/canvas/inc/canvas/parametricpolypolygon.hxx
@@ -149,12 +149,6 @@ namespace canvas
const ::basegfx::B2DPolygon&
 rGradientPoly,
GradientType
 eType,
const ::com::sun::star::uno::Sequence< 
::com::sun::star::uno::Sequence< double > >&  colors,
-   const ::com::sun::star::uno::Sequence< double 
>& stops );
-ParametricPolyPolygon( const ::com::sun::star::uno::Reference<
-   ::com::sun::star::rendering::XGraphicDevice 
>&   rDevice,
-   const ::basegfx::B2DPolygon&
 rGradientPoly,
-   GradientType
 eType,
-   const ::com::sun::star::uno::Sequence< 
::com::sun::star::uno::Sequence< double > >&  colors,
const ::com::sun::star::uno::Sequence< double 
>& stops,
double  
 nAspectRatio );
 ParametricPolyPolygon( const ::com::sun::star::uno::Reference<
diff --git a/canvas/source/tools/parametricpolypolygon.cxx 
b/canvas/source/tools/parametricpolypolygon.cxx
index 45e9c0d..ea7675a 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -238,21 +238,6 @@ namespace canvas
   const ::basegfx::B2DPolygon& 
 rGradientPoly,
   GradientType 
 eType,
   const uno::Sequence< 
uno::Sequence< double > >&   rColors,
-  const uno::Sequence< double 
>&rStops ) :
-ParametricPolyPolygon_Base( m_aMutex ),
-mxDevice( rDevice ),
-maValues( rGradientPoly,
-  rColors,
-  rStops,
-  1.0,
-  eType )
-{
-}
-
-ParametricPolyPolygon::ParametricPolyPolygon( const uno::Reference< 
rendering::XGraphicDevice >&rDevice,
-  const ::basegfx::B2DPolygon& 
 rGradientPoly,
-  GradientType 
 eType,
-  const uno::Sequence< 
uno::Sequence< double > >&   rColors,
   const uno::Sequence< double 
>&rStops,
   double   
 nAspectRatio ) :
 ParametricPolyPolygon_Base( m_aMutex ),
diff --git a/unusedcode.easy b/unusedcode.easy
index 5611973..6504e38 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -702,7 +702,6 @@ cairocanvas::CanvasHelper::flush() const
 cairocanvas::CanvasHelper::getPalette()
 cairocanvas::SpriteDeviceHelper::getSurface()
 cairocanvas::TextLayout::draw(_cairo*)
-canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Reference
 const&, basegfx::B2DPolygon const&, 
canvas::ParametricPolyPolygon::GradientType, 
com::sun::star::uno::Sequence > const&, 
com::sun::star::uno::Sequence const&)
 
canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector::MapEntry,
 
std::allocator::MapEntry>
 > const&)
 canvas::createSurfaceProxyManager(boost::shared_ptr 
const&)
 canvas::tools::ElapsedTime::getTimeBase() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unusedcode.easy vbahelper/source

2012-04-10 Thread Caolán McNamara

 unusedcode.easy|2 
 vbahelper/source/vbahelper/vbafontbase.cxx |   62 -
 2 files changed, 64 deletions(-)

New commits:
commit 231520e7bb996f5ec211ff7e4f64e20f112d8789
Author: GÃ¡bor Stefanik 
Date:   Sat Apr 7 19:28:05 2012 +0200

Kill vbaFontBase::get/setUnderline

diff --git a/unusedcode.easy b/unusedcode.easy
index effe4e4..5611973 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -298,8 +298,6 @@ VCLXDevice::IsCreatedWithToolkit() const
 VCLXPrinterServer::getImplementationId()
 VCLXPrinterServer::getTypes()
 VCLXRadioButton::getFirstActionListener()
-VbaFontBase::getUnderline()
-VbaFontBase::setUnderline(com::sun::star::uno::Any const&)
 VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequence&)
 VbaFoundFilesEnum::VbaFoundFilesEnum()
 VclEventListeners2::~VclEventListeners2()
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx 
b/vbahelper/source/vbahelper/vbafontbase.cxx
index 3f681c6..59dc77f 100644
--- a/vbahelper/source/vbahelper/vbafontbase.cxx
+++ b/vbahelper/source/vbahelper/vbafontbase.cxx
@@ -276,66 +276,4 @@ VbaFontBase::setColor( const uno::Any& _color  ) throw 
(uno::RuntimeException)
 mxFont->setPropertyValue( VBAFONTBASE_PROPNAME( "CharColor", "TextColor" 
), XLRGBToOORGB(_color) );
 }
 
-void SAL_CALL
-VbaFontBase::setUnderline( const uno::Any& /*aValue*/ ) throw ( 
uno::RuntimeException )
-{
-/*
-// default
-sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
-aValue >>= nValue;
-switch ( nValue )
-{
-// NOTE:: #TODO #FIMXE
-// xlUnderlineStyleDoubleAccounting & xlUnderlineStyleSingleAccounting
-// don't seem to be supported in Openoffice.
-// The import filter converts them to single or double underlines as 
appropriate
-// So, here at the moment we are similarly silently converting
-// xlUnderlineStyleSingleAccounting to xlUnderlineStyleSingle.
-
-case excel::XlUnderlineStyle::xlUnderlineStyleNone:
-nValue = awt::FontUnderline::NONE;
-break;
-case excel::XlUnderlineStyle::xlUnderlineStyleSingle:
-case excel::XlUnderlineStyle::xlUnderlineStyleSingleAccounting:
-nValue = awt::FontUnderline::SINGLE;
-break;
-case excel::XlUnderlineStyle::xlUnderlineStyleDouble:
-case excel::XlUnderlineStyle::xlUnderlineStyleDoubleAccounting:
-nValue = awt::FontUnderline::DOUBLE;
-break;
-default:
-throw uno::RuntimeException( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("Unknown value for Underline")), uno::Reference< 
uno::XInterface >() );
-}
-
-mxFont->setPropertyValue( VBAFONTBASE_PROPNAME( "CharUnderline", 
"FontUnderline" ), uno::Any( nValue ) );
-*/
-
-}
-
-uno::Any SAL_CALL
-VbaFontBase::getUnderline() throw ( uno::RuntimeException )
-{
-sal_Int32 nValue = awt::FontUnderline::NONE;
-mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharUnderline", 
"FontUnderline" ) ) >>= nValue;
-/*
-switch ( nValue )
-{
-case  awt::FontUnderline::DOUBLE:
-nValue = excel::XlUnderlineStyle::xlUnderlineStyleDouble;
-break;
-case  awt::FontUnderline::SINGLE:
-nValue = excel::XlUnderlineStyle::xlUnderlineStyleSingle;
-break;
-case  awt::FontUnderline::NONE:
-nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
-break;
-default:
-throw uno::RuntimeException( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("Unknown value retrieved for Underline") ), 
uno::Reference< uno::XInterface >() );
-
-}
-*/
-return uno::makeAny( nValue );
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

2012-04-10 Thread Caolán McNamara

 sfx2/source/doc/docinf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 628d2e71aca4a97723efe36bc398a06e36f199a8
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 10 13:13:24 2012 +0100

fix tinderbox

diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index 3048a3e..136d9cf 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -241,7 +241,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet(
 rGlobSect.SetFileTimeValue( PROPID_EDITTIME, aEditTime );
 
 rGlobSect.SetStringValue( PROPID_REVNUMBER,
-rtl::OUString::valueOf( i_xDocProps->getEditingCycles() ) );
+rtl::OUString::valueOf( 
static_cast(i_xDocProps->getEditingCycles()) ) );
 if ( i_pThumb && i_pThumb->getLength() )
 rGlobSect.SetThumbnailValue( PROPID_THUMBNAIL, *i_pThumb );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: slideshow/source

2012-04-10 Thread Caolán McNamara

 slideshow/source/engine/smilfunctionparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c8c911f129fd63450116ab95907f789301fce43
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 10 13:11:57 2012 +0100

fix build

diff --git a/slideshow/source/engine/smilfunctionparser.cxx 
b/slideshow/source/engine/smilfunctionparser.cxx
index c7f64cf..c1b630e 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -53,7 +53,7 @@
 #endif
 #include 
 
-#if OSL_DEBUG_LEVEL >= 2
+#if OSL_DEBUG_LEVEL > 0
 #include 
 #endif
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unotools/inc

2012-04-10 Thread Caolán McNamara

 unotools/inc/unotools/bootstrap.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dcf24756e5b866a62639ade71df4352f1b8471b1
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 10 12:52:14 2012 +0100

fix typo

diff --git a/unotools/inc/unotools/bootstrap.hxx 
b/unotools/inc/unotools/bootstrap.hxx
index 922f417..d964cf3 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/unotools/inc/unotools/bootstrap.hxx
@@ -62,7 +62,7 @@ namespace utl
 static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault);
 
 /// retrieve the BuildVersion information item; uses the given 
default, if not found
-static rtl::OUString getBuildVersion(rtl::OUOUString const& _sDefault);
+static rtl::OUString getBuildVersion(rtl::OUString const& _sDefault);
 
 /// reload cached data
 static void reloadData();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - binfilter/bf_sch binfilter/bf_svtools binfilter/bf_sw binfilter/inc

2012-04-10 Thread Caolán McNamara

 binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx |5 
 binfilter/bf_svtools/source/misc/tl_strimp.cxx  |  426 
 binfilter/bf_svtools/source/misc/tl_tstring.cxx |   94 ---
 binfilter/bf_svtools/source/misc/tl_tustring.cxx|  426 
 binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx   |   30 -
 binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx   |   12 
 binfilter/inc/bf_sw/iodetect.hxx|2 
 binfilter/inc/bf_tools/string.hxx   |   64 --
 8 files changed, 454 insertions(+), 605 deletions(-)

New commits:
commit c1ed15532ca066c67d05432c3e2f99c7feccbaf9
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 10 12:49:13 2012 +0100

WaE: msvc potentially used uninitialized

diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 4cd3f56..b8e0722 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -1180,7 +1180,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/   pType = lcl_sw3io_InSetExpFieldType( rIo );
 /*N*/   else
 /*N*/   {
-/*N*/   USHORT nPoolId;
+/*N*/   USHORT nPoolId=0;
 /*N*/   *rIo.pStrm >> nPoolId;
 /*N*/
 /*N*/   // fix #26064#: Namen der 3 Label-Numernkreise: Hier wird die
@@ -1196,8 +1196,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/   }
 /*N*/   }
 /*N*/
-/*N*/   UINT16 nSeqNo;
-/*N*/   BYTE cFlags;
+/*N*/   UINT16 nSeqNo=0;
+/*N*/   BYTE cFlags=0;
 /*N*/   String aFormula, aExpand, aPrompt;
 /*N*/   *rIo.pStrm >> cFlags;
 /*N*/   rIo.InString( *rIo.pStrm, aFormula );
@@ -1256,8 +1256,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/ {
 /*N*/   pType = 0;
 /*N*/
-/*N*/   BYTE cFlags;
-/*N*/   UINT16 nPoolId, nSeqNo=0, nSeqVal=0;
+/*N*/   BYTE cFlags=0;
+/*N*/   UINT16 nPoolId=0, nSeqNo=0, nSeqVal=0;
 /*N*/   String aFormula, aPrompt, aExpand;
 /*N*/   *rIo.pStrm  >> cFlags >> nPoolId;
 /*N*/   rIo.InString( *rIo.pStrm, aFormula );
@@ -1314,9 +1314,9 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/ SwField* lcl_sw3io_InHiddenParaField( Sw3IoImp& rIo, SwFieldType* pType,
 /*N*/ USHORT, UINT32& )
 /*N*/ {
-/*N*/   BYTE bHidden;
-/*N*/   String aCond;
+/*N*/   BYTE bHidden=FALSE;
 /*N*/   *rIo.pStrm >> bHidden;
+/*N*/   String aCond;
 /*N*/   rIo.InString( *rIo.pStrm, aCond );
 /*N*/   SwHiddenParaField* pFld = new SwHiddenParaField( 
(SwHiddenParaFieldType*)pType, aCond );
 /*N*/   pFld->SetHidden( (BOOL) bHidden );
@@ -1326,7 +1326,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/ SwField* lcl_sw3io_InDocInfoField40( Sw3IoImp& rIo, SwFieldType* pType,
 /*N*/USHORT nSubType, UINT32& rFmt )
 /*N*/ {
-/*N*/   UINT16 nSub;
+/*N*/   UINT16 nSub=0;
 /*N*/   *rIo.pStrm >> nSub;
 /*N*/   nSubType |= nSub;
 /*N*/
@@ -1338,12 +1338,12 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/ SwField* lcl_sw3io_InDocInfoField( Sw3IoImp& rIo, SwFieldType* pType,
 /*N*/  USHORT nSubType, UINT32& rFmt )
 /*N*/ {
-/*N*/   BYTE cFlags;
 /*N*/   SwDocInfoField *pFld = new SwDocInfoField( (SwDocInfoFieldType*)pType,
 /*N*/  nSubType, rFmt );
 /*N*/
-/*N*/   String aContent;
+/*N*/   BYTE cFlags=FALSE;
 /*N*/   *rIo.pStrm >> cFlags;
+/*N*/   String aContent;
 /*N*/   rIo.InString( *rIo.pStrm, aContent );
 /*N*/   pFld->SetExpansion(aContent);
 /*N*/   if( cFlags & 0x01 )
@@ -1415,9 +1415,9 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/ SwField* lcl_sw3io_InDBSetNumberField( Sw3IoImp& rIo, SwFieldType* pType,
 /*N*/  USHORT, UINT32& )
 /*N*/ {
-/*N*/   String aDBName;
-/*N*/   INT32 n;
+/*N*/   INT32 n=0;
 /*N*/   *rIo.pStrm >> n;
+/*N*/   String aDBName;
 /*N*/   if( rIo.IsVersion( SWG_MULTIDB, SWG_EXPORT31, SWG_DESKTOP40 ) )
 /*N*/   {
 /*N*/   USHORT nPoolId;
@@ -1436,8 +1436,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/USHORT, UINT32& )
 /*N*/ {
 /*N*/   String aData;
-/*N*/   UINT16 nSubType;
 /*N*/   rIo.InString( *rIo.pStrm, aData );
+/*N*/   UINT16 nSubType=0;
 /*N*/   *rIo.pStrm >> nSubType;
 /*N*/   SwExtUserField* pFld = new SwExtUserField( (SwExtUserFieldType*)pType, 
nSubType );
 /*N*/   ((SwExtUserFieldType*)pType)->SetData( aData );
@@ -1466,8 +1466,8 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( 
Sw3IoImp& rIo )
 /*N*/ SwField* lcl_sw3io_InRefPageSetField( Sw3IoImp& rIo, SwFieldType* pType,
 /*N*/ USHORT, UINT32& )
 /*N*/ {
-INT16 nOffset;
-BYTE cIsOn;
+INT16 nOffset=0;
+

[Libreoffice-commits] .: sc/source unusedcode.easy

2012-04-08 Thread Caolán McNamara

 sc/source/filter/inc/richstring.hxx   |2 
 sc/source/filter/inc/workbooksettings.hxx |3 -
 sc/source/filter/inc/worksheethelper.hxx  |8 ---
 sc/source/filter/oox/richstring.cxx   |9 
 sc/source/filter/oox/workbooksettings.cxx |5 --
 sc/source/filter/oox/worksheethelper.cxx  |   67 --
 unusedcode.easy   |3 -
 7 files changed, 97 deletions(-)

New commits:
commit b68c42fd68760cbce0a0ca4ac81d4aeaf777e7fa
Author: CaolÃ¡n McNamara 
Date:   Sun Apr 8 16:29:57 2012 +0100

callcatcher: reduce WorksheetHelper

diff --git a/sc/source/filter/inc/richstring.hxx 
b/sc/source/filter/inc/richstring.hxx
index 588deae..07a645a 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -164,8 +164,6 @@ public:
 voidimportPhoneticPr( const AttributeList& rAttribs );
 /** Imports phonetic settings from the PHONETICPR record. */
 voidimportPhoneticPr( SequenceInputStream& rStrm );
-/** Imports phonetic settings from the PHONETICPR record. */
-voidimportPhoneticPr( BiffInputStream& rStrm );
 
 /** Imports phonetic settings from a rich string. */
 voidimportStringData( SequenceInputStream& rStrm );
diff --git a/sc/source/filter/inc/workbooksettings.hxx 
b/sc/source/filter/inc/workbooksettings.hxx
index ed47d54..2346708 100644
--- a/sc/source/filter/inc/workbooksettings.hxx
+++ b/sc/source/filter/inc/workbooksettings.hxx
@@ -109,9 +109,6 @@ public:
 /** Imports the CALCPR record containing workbook calculation settings. */
 voidimportCalcPr( SequenceInputStream& rStrm );
 
-/** Sets the save external linked values flag, e.g. from the WSBOOL 
record. */
-voidsetSaveExtLinkValues( bool bSaveExtLinks );
-
 /** Converts the imported workbook settings. */
 voidfinalizeImport();
 
diff --git a/sc/source/filter/inc/worksheethelper.hxx 
b/sc/source/filter/inc/worksheethelper.hxx
index facb12e..93d8089 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -248,19 +248,13 @@ public:
 SheetViewSettings&  getSheetViewSettings() const;
 /** Returns the VML drawing page for this sheet (OOXML/BIFF12 only). */
 VmlDrawing& getVmlDrawing() const;
-/** Returns the BIFF drawing page for this sheet (BIFF2-BIFF8 only). */
-BiffSheetDrawing&   getBiffDrawing() const;
 
-/** Changes the current sheet type. */
-voidsetSheetType( WorksheetType eSheetType );
 /** Sets a column or row page break described in the passed struct. */
 voidsetPageBreak( const PageBreakModel& rModel, bool 
bRowBreak );
 /** Inserts the hyperlink URL into the spreadsheet. */
 voidsetHyperlink( const HyperlinkModel& rModel );
 /** Inserts the data validation settings into the spreadsheet. */
 voidsetValidation( const ValidationModel& rModel );
-/** Sets the passed label ranges to the current sheet. */
-voidsetLabelRanges( const ApiCellRangeList& rColRanges, 
const ApiCellRangeList& rRowRanges );
 /** Sets the path to the DrawingML fragment of this sheet. */
 voidsetDrawingPath( const ::rtl::OUString& rDrawingPath );
 /** Sets the path to the legacy VML drawing fragment of this sheet. */
@@ -279,8 +273,6 @@ public:
 /** Sets default width for all columns. This function overrides the base
 width set with the setBaseColumnWidth() function. */
 voidsetDefaultColumnWidth( double fWidth );
-/** Converts default cell formatting for a range of columns. */
-voidsetDefaultColumnFormat( sal_Int32 nFirstCol, sal_Int32 
nLastCol, sal_Int32 nXfId );
 /** Sets column settings for a specific range of columns.
 @descr  Column default formatting is converted directly, other settings
 are cached and converted in the finalizeWorksheetImport() call. */
diff --git a/sc/source/filter/oox/richstring.cxx 
b/sc/source/filter/oox/richstring.cxx
index 28c0d0c..823d9de 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -251,15 +251,6 @@ void PhoneticSettings::importPhoneticPr( 
SequenceInputStream& rStrm )
 maModel.setBiffData( nType, nAlignment );
 }
 
-void PhoneticSettings::importPhoneticPr( BiffInputStream& rStrm )
-{
-sal_uInt16 nFontId, nFlags;
-rStrm >> nFontId >> nFlags;
-maModel.mnFontId = nFontId;
-maModel.setBiffData( extractValue< sal_Int32 >( nFlags, 0, 2 ), 
extractValue< sal_Int32 >( nFlags, 2, 2 ) );
-// following: range list with cells showing phonetic text
-}
-
 void PhoneticSettings::importStringData( SequenceInputStream& rStrm )
 {
 sal_uInt16 nFontId, nFlags;
diff --git a/sc/source/filter/oox/workbooksettings.cxx 
b/sc/source/filter/oox

[Libreoffice-commits] .: 2 commits - l10ntools/inc sal/qa

2012-04-07 Thread Caolán McNamara

 l10ntools/inc/l10ntools/HelpIndexer.hxx |   31 +++
 l10ntools/inc/l10ntools/HelpSearch.hxx  |   31 +++
 sal/qa/osl/file/osl_old_test_file.cxx   |   24 +++-
 3 files changed, 69 insertions(+), 17 deletions(-)

New commits:
commit e414736c8b3e55b4ddc2bf308435ef6f726fb517
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 7 16:42:30 2012 +0100

add headers to Gert's files

diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx 
b/l10ntools/inc/l10ntools/HelpIndexer.hxx
index 02281c2..28c7eb6 100644
--- a/l10ntools/inc/l10ntools/HelpIndexer.hxx
+++ b/l10ntools/inc/l10ntools/HelpIndexer.hxx
@@ -1,3 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Gert van Valkenhoef 
+ *  (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.
+ */
+
 #ifndef HELPINDEXER_HXX
 #define HELPINDEXER_HXX
 
@@ -67,3 +96,5 @@ class L10N_DLLPUBLIC HelpIndexer {
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/l10ntools/HelpSearch.hxx 
b/l10ntools/inc/l10ntools/HelpSearch.hxx
index 8c11aba..63e2807 100644
--- a/l10ntools/inc/l10ntools/HelpSearch.hxx
+++ b/l10ntools/inc/l10ntools/HelpSearch.hxx
@@ -1,3 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Gert van Valkenhoef 
+ *  (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.
+ */
+
 #ifndef HELPSEARCH_HXX
 #define HELPSEARCH_HXX
 
@@ -34,3 +63,5 @@ class L10N_DLLPUBLIC HelpSearch {
 };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 63de3197af6ce874e441936638c4a9a73af4b1a3
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 7 16:14:51 2012 +0100

WaE: msvc, unreachable code

diff --git a/sal/qa/osl/file/osl_old_test_file.cxx 
b/sal/qa/osl/file/osl_old_test_file.cxx
index 3d12b76..d8ab73a 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -115,12 +115,10 @@ const char * const aSource3[ ] =
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 using ::rtl::OString;
+
 void oldtestfile::test_file_001()
 {
-#ifdef WIN32
-return;
-#endif
-
+#ifndef WIN32
 OUString base1( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla" 
) );
 int i;
 for( i = 0 ; aSource1[i] ; i +=2 )
@@ -142,15 +140,12 @@ void oldtestfile::test_file_001()
 OUString err1( RTL_CONSTASCII_USTRINGPARAM( "../.." ) );
 OUString target;
 // CPPUNIT_ASSERT_MESSAGE("failure #11",  osl_File_E_None != 
osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) );
-
+#endif
 }
 
 void oldtestfile::test_file_002()
 {
-#ifdef WIN32
-return;
-#endif
-
+#ifndef WIN32
 OUString base2( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME 
"bla/blubs/schnubbel" ) );
 int i;
 for(  i = 0 ; aSource2[i] ; i +=2 )
@@ -166,16 +161,13 @@ void oldtestfile::test_file_002()
 }
 OString o = OUStringToOString

[Libreoffice-commits] .: 2 commits - connectivity/source oox/inc oox/source sc/source toolkit/inc toolkit/source unusedcode.easy vcl/inc vcl/source

2012-04-07 Thread Caolán McNamara

 connectivity/source/drivers/mozab/MTable.cxx |6 -
 connectivity/source/drivers/mozab/MTable.hxx |1 
 oox/inc/oox/dump/dumperbase.hxx  |2 
 oox/inc/oox/ole/olehelper.hxx|8 -
 oox/source/dump/dumperbase.cxx   |   10 --
 oox/source/ole/olehelper.cxx |   97 --
 sc/source/filter/inc/biffhelper.hxx  |3 
 sc/source/filter/oox/biffhelper.cxx  |   98 ---
 toolkit/inc/toolkit/controls/unocontrolmodel.hxx |1 
 toolkit/inc/toolkit/helper/macros.hxx|7 +
 toolkit/source/controls/unocontrolmodel.cxx  |8 -
 unusedcode.easy  |5 -
 vcl/inc/vcl/pdfwriter.hxx|3 
 vcl/inc/vcl/slider.hxx   |1 
 vcl/source/control/slider.cxx|   19 
 vcl/source/gdi/pdfwriter.cxx |5 -
 vcl/source/gdi/pdfwriter_impl.cxx|   42 -
 vcl/source/gdi/pdfwriter_impl.hxx|1 
 18 files changed, 6 insertions(+), 311 deletions(-)

New commits:
commit aefbfc7101bb9b4ef20968d45306ab97573f6597
Author: CaolÃ¡n McNamara 
Date:   Sat Apr 7 15:53:56 2012 +0100

callcatcher: update and remove newly unused methods

diff --git a/connectivity/source/drivers/mozab/MTable.cxx 
b/connectivity/source/drivers/mozab/MTable.cxx
index 755e4bd..47f7107 100644
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
@@ -55,12 +55,6 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection)
-:OTable_Base( _pTables, _pConnection, sal_True )
-,m_pConnection( _pConnection )
-{
-construct();
-}
 // -
 OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
 const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, 
const ::rtl::OUString& _Description )
diff --git a/connectivity/source/drivers/mozab/MTable.hxx 
b/connectivity/source/drivers/mozab/MTable.hxx
index 3cc6728..a47725f 100644
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
@@ -44,7 +44,6 @@ namespace connectivity
 OConnection*m_pConnection;
 
 public:
-OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection);
 OTable( sdbcx::OCollection* _pTables,
 OConnection* _pConnection,
 const ::rtl::OUString& _Name,
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 68df688..fb1ede5 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1067,8 +1067,6 @@ public:
 voidwriteArray( const sal_uInt8* pnData, sal_Size nSize, 
sal_Unicode cSep = OOX_DUMP_LISTSEP );
 voidwriteBool( bool bData );
 voidwriteDateTime( const ::com::sun::star::util::DateTime& 
rDateTime );
-voidwriteColIndex( sal_Int32 nCol );
-voidwriteRowIndex( sal_Int32 nRow );
 
 template< typename Type >
 inline void writeDec( Type nData, sal_Int32 nWidth = 0, 
sal_Unicode cFill = ' ' )
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index 933d4a5..c7f3960 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/oox/inc/oox/ole/olehelper.hxx
@@ -148,14 +148,6 @@ public:
 BinaryInputStream& rInStrm,
 bool bWithGuid );
 
-/** Imports an OLE StdHlink from the current position of the passed binary
-stream.
- */
-static bool importStdHlink(
-StdHlinkInfo& orHlinkInfo,
-BinaryInputStream& rInStrm,
-bool bWithGuid );
-
 private:
 OleHelper();// not implemented
 ~OleHelper();   // not implemented
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 1f1cbc2..0d8039d 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1828,16 +1828,6 @@ void Output::writeDateTime( const DateTime& rDateTime )
 writeDec( rDateTime.Seconds, 2, '0' );
 }
 
-void Output::writeColIndex( sal_Int32 nCol )
-{
-StringHelper::appendAddrCol( maLine, nCol, true );
-}
-
-void Output::writeRowIndex( sal_Int32 nRow )
-{
-StringHelper::appendAddrRow( maLine, nRow, true );
-}
-
 // 
 
 bool Output::implIsValid() const
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index dd9676e..dcd3982 100644
--- a/oox

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 3 commits - vcl/inc vcl/source

2012-04-06 Thread Caolán McNamara

 vcl/inc/vcl/window.hxx |   32 ++--
 vcl/source/control/lstbox.cxx  |4 
 vcl/source/control/tabctrl.cxx |4 ++--
 vcl/source/window/tabdlg.cxx   |2 +-
 vcl/source/window/window.cxx   |8 +---
 5 files changed, 42 insertions(+), 8 deletions(-)

New commits:
commit f4da833118b23015d13afde3403886e6c109606f
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 6 21:28:37 2012 +0100

document methods

diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 625e9f5..01e37ee 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -586,6 +586,15 @@ protected:
 voidCallEventListeners( sal_uLong nEvent, void* pData = 
NULL );
 voidFireVclEvent( VclSimpleEvent* pEvent );
 
+/*
+ * Widgets call this to inform their owner container that the widget wants
+ * to renegotiate its size. Should be called when a widget has a new size
+ * request. e.g. a FixedText Control gets a new label.
+ *
+ * akin to gtk_widget_queue_resize
+ */
+SAL_DLLPRIVATE void queue_resize();
+
 // FIXME: this is a hack to workaround missing layout functionality
 SAL_DLLPRIVATE void ImplAdjustNWFSizes();
 public:
@@ -1060,10 +1069,29 @@ public:
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard();
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::datatransfer::clipboard::XClipboard > GetPrimarySelection();
 
-// Advisory Sizing - what is a good size for this widget ?
+/*
+ * Advisory Sizing - what is a good size for this widget
+ *
+ * Retrieves the preferred size of a widget ignoring
+ * "width-request" and "height-request" properties.
+ *
+ * Implement this in sub-classes to tell layout
+ * the preferred widget size.
+ */
 virtual Size GetOptimalSize(WindowSizeType eType) const;
+
+/*
+ * Retrieves the preferred size of a widget taking
+ * into account the "width-request" and "height-request" properties.
+ *
+ * Overrides the result of GetOptimalSize to honor the
+ * width-request and height-request properties.
+ *
+ * @see GetOptimalSize
+ *
+ * akin to gtk_widget_get_preferred_size
+ */
 Size get_preferred_size() const;
-void queueResize();
 
 virtual void setChildAnyProperty(const rtl::OString &rString, const 
::com::sun::star::uno::Any &rValue);
 virtual ::com::sun::star::uno::Any getWidgetAnyProperty(const rtl::OString 
&rString) const;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 6196d77..e594207 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1957,14 +1957,14 @@ void TabControl::SetTabPage( sal_uInt16 nPageId, 
TabPage* pTabPage )
 
 // Erst hier setzen, damit Resize nicht TabPage umpositioniert
 pItem->mpTabPage = pTabPage;
-queueResize();
+queue_resize();
 if ( pItem->mnId == mnCurPageId )
 ImplChangeTabPage( pItem->mnId, 0 );
 }
 else
 {
 pItem->mpTabPage = NULL;
-queueResize();
+queue_resize();
 }
 }
 }
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 517ce33..0701533 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -260,7 +260,7 @@ void TabDialog::StateChanged( StateChangedType nType )
 void TabDialog::AdjustLayout()
 {
 ImplPosControls();
-queueResize();
+queue_resize();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e24c713..d16b831 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4927,7 +4927,7 @@ void Window::UserEvent( sal_uLong, void* )
 
 void Window::StateChanged( StateChangedType )
 {
-queueResize();
+queue_resize();
 DBG_CHKTHIS( Window, ImplDbgCheckWindow );
 }
 
@@ -9632,7 +9632,7 @@ Selection Window::GetSurroundingTextSelection() const
 
 //Poor man's equivalent, when widget wants to renegotiate
 //size, get parent dialog and call resize on it
-void Window::queueResize()
+void Window::queue_resize()
 {
 Dialog *pParent = GetParentDialog();
 if (!pParent)
commit 18130178e408b79968773f90316dead1f0f26f72
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 6 09:01:50 2012 +0100

don't bother with children resize request while dialog is closing

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index dfb839f..e24c713 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9630,13 +9630,15 @@ Selection Window::GetSurroundingTextSelection() const
   return Selection( 0, 0 );
 }
 
-//Poor man's equivalent, when widget want's to renegotiate
+//Poor man's equivalent, when widget wants to renegotiate
 //size, get parent dialog and

[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

2012-04-06 Thread Caolán McNamara

 binfilter/bf_sc/source/core/data/sc_global.cxx  |   27 ---
 binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc|   55 --
 binfilter/bf_sc/source/ui/dbgui/makefile.mk |2 
 binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx |  214 
 binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.src |   66 ---
 binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx |2 
 binfilter/bf_sc/source/ui/inc/asciiopt.hxx  |  105 ---
 binfilter/bf_sc/source/ui/inc/csvgrid.hxx   |1 
 binfilter/bf_sc/source/ui/inc/csvtablebox.hxx   |   48 -
 binfilter/bf_sc/source/ui/inc/imoptdlg.hxx  |4 
 binfilter/inc/bf_sc/global.hxx  |1 
 11 files changed, 1 insertion(+), 524 deletions(-)

New commits:
commit d8a4706e91bf5ca518af96434394e24d10a5e0e6
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 6 22:37:45 2012 +0100

callcatcher: recently unused code

diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx 
b/binfilter/bf_sc/source/core/data/sc_global.cxx
index 96da4ca..c952081 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -545,33 +545,6 @@ void global_InitAppOptions();
 //
 
 // static
-/*N*/ CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
-/*N*/ {
-/*N*/   // new TextEncoding values
-/*N*/   if ( CharClass::isAsciiNumeric( rCharSet ) )
-/*N*/   {
-/*?*/   sal_Int32 nVal = rCharSet.ToInt32();
-/*?*/   if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW )
-/*?*/   return osl_getThreadTextEncoding();
-/*?*/   return (CharSet) nVal;
-/*N*/   }
-/*N*/   // old CharSet values for compatibility
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("ANSI") ) return 
RTL_TEXTENCODING_MS_1252;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("MAC")  ) return 
RTL_TEXTENCODING_APPLE_ROMAN;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC")) return 
RTL_TEXTENCODING_IBM_850;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_437")) return 
RTL_TEXTENCODING_IBM_437;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_850")) return 
RTL_TEXTENCODING_IBM_850;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_860")) return 
RTL_TEXTENCODING_IBM_860;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return 
RTL_TEXTENCODING_IBM_861;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return 
RTL_TEXTENCODING_IBM_863;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return 
RTL_TEXTENCODING_IBM_865;
-/*N*/ //else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM")   ) return 
osl_getThreadTextEncoding();
-/*N*/   else return osl_getThreadTextEncoding();
-/*N*/ }
-
-//
-
-// static
 /*N*/ String ScGlobal::GetCharsetString( CharSet eVal )
 /*N*/ {
 /*N*/   const sal_Char* pChar;
diff --git a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc 
b/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
deleted file mode 100644
index e734e1c..000
--- a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * 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.
- *
- /
-#include "bf_sc.hrc"
-//#define RID_SCDLG_ASCII 256
-#define RB_SEPARATED 1
-#define RB_FIXED 2
-#define FT_CHARSET 3
-#define LB_CHARSET 4
-#define FL_SEPOPT 5
-#define FT_FIELDSEP 6
-#define CB_FIELDSEP 7
-#define FT_TEXTSEP 8
-#define CB_TEXTSEP 9
-#define FL_FIELDOPT 10
-#define FT_TYPE 12
-#define FT_PREVIEW 13
-#define LB_TYPE1 23
-#define FL_WIDTH 30
-#define BTN_OK 31
-#define BTN_CANCEL 32
-#define BTN_HELP 33
-#define CTR_TABLEBOX 41
-#define CKB_TAB 51
-#define CKB_SPACE 52
-#define CKB_SEMICOLON 53
-#define CKB_COMMA 54
-#define CKB_OTHER 55
-#define ED_OTHER 56
-#define FT_AT_ROW 59
-#define NF_AT_ROW 60
-#define CB_

[Libreoffice-commits] .: 3 commits - sw/inc sw/source unusedcode.easy

2012-04-06 Thread Caolán McNamara

 sw/inc/swurl.hxx |   12 ++
 sw/source/core/access/acchyperlink.cxx   |4 +--
 sw/source/core/text/txtftn.cxx   |3 --
 sw/source/ui/app/docstyle.cxx|5 ++--
 sw/source/ui/docvw/SidebarTxtControl.cxx |2 -
 sw/source/ui/docvw/edtwin.cxx|2 -
 sw/source/ui/docvw/romenu.cxx|2 -
 sw/source/ui/fldui/xfldui.cxx|2 -
 sw/source/ui/wrtsh/wrtsh2.cxx|   36 +--
 unusedcode.easy  |   28 ++--
 10 files changed, 36 insertions(+), 60 deletions(-)

New commits:
commit 16fc0fdb9008ffc48a6a363ffcd50555835a3857
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 6 22:38:16 2012 +0100

callcatcher: update unused code

diff --git a/unusedcode.easy b/unusedcode.easy
index 91368d3..cb5c9fe 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -775,7 +775,6 @@ dbtools::getConnection(rtl::OUString const&, rtl::OUString 
const&, rtl::OUString
 dbtools::throwFunctionNotSupportedException(rtl::OUString const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Any const&)
 dp_misc::TRACE(rtl::OString const&)
 dp_misc::writeConsoleError(rtl::OString const&)
-drawinglayer::attribute::SdrFillTextAttribute::isDefault() const
 drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
 drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
 drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const
@@ -799,25 +798,15 @@ 
oox::PropertyMap::dump(com::sun::star::uno::Reference
 const&)
 oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const
 
oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier&) 
const
-oox::dump::Output::writeAddress(oox::dump::Address const&)
+oox::dump::InputObjectBase::dumpNullCharArray(oox::dump::String const&, 
unsigned short)
+oox::dump::InputObjectBase::dumpNullUnicodeArray(oox::dump::String const&)
+oox::dump::Output::writeColRange(int, int)
+oox::dump::Output::writeColRowRange(int, int)
 oox::dump::Output::writeColorABGR(int)
-oox::dump::Output::writeRange(oox::dump::Range const&)
-oox::dump::Output::writeRangeList(std::__debug::vector > const&)
-oox::dump::OutputObjectBase::writeAddressItem(oox::dump::String const&, 
oox::dump::Address const&)
-oox::dump::OutputObjectBase::writeColIndexItem(oox::dump::String const&, int)
-oox::dump::OutputObjectBase::writeColRangeItem(oox::dump::String const&, int, 
int)
-oox::dump::OutputObjectBase::writeRangeItem(oox::dump::String const&, 
oox::dump::Range const&)
-oox::dump::OutputObjectBase::writeRangeListItem(oox::dump::String const&, 
std::__debug::vector > 
const&)
-oox::dump::OutputObjectBase::writeRowIndexItem(oox::dump::String const&, int)
-oox::dump::OutputObjectBase::writeRowRangeItem(oox::dump::String const&, int, 
int)
-oox::dump::OutputObjectBase::writeTokenAddress3dItem(oox::dump::String const&, 
rtl::OUString const&, oox::dump::TokenAddress const&, bool)
-oox::dump::OutputObjectBase::writeTokenAddressItem(oox::dump::String const&, 
oox::dump::TokenAddress const&, bool)
-oox::dump::OutputObjectBase::writeTokenRange3dItem(oox::dump::String const&, 
rtl::OUString const&, oox::dump::TokenRange const&, bool)
-oox::dump::OutputObjectBase::writeTokenRangeItem(oox::dump::String const&, 
oox::dump::TokenRange const&, bool)
+oox::dump::Output::writeRowRange(int, int)
 oox::dump::SequenceRecordObjectBase::construct(oox::dump::OutputObjectBase 
const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, 
oox::dump::String const&)
-oox::dump::StdHlinkObject::StdHlinkObject(oox::dump::InputObjectBase const&)
-oox::dump::StringHelper::appendToken(rtl::OUStringBuffer&, long, unsigned 
short)
-oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, 
unsigned short)
+oox::dump::StringHelper::appendRange(rtl::OUStringBuffer&, 
oox::dump::TokenRange const&, bool)
+oox::dump::StringHelper::appendRangeList(rtl::OUStringBuffer&, 
std::__debug::vector > 
const&)
 oox::ole::OleHelper::importStdHlink(oox::ole::StdHlinkInfo&, 
oox::BinaryInputStream&, bool)
 
oox::xls::BiffAutoFilterContext::BiffAutoFilterContext(oox::xls::WorksheetHelper
 const&, oox::xls::AutoFilter&)
 oox::xls::BiffCodecHelper::implReadFilePass(oox::xls::BiffInputStream&, 
oox::xls::BiffType)
@@ -889,9 +878,6 @@ sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
 sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
 sd::View::LockRedraw(unsigned char)
 sd::ViewShellBase::RegisterFactory(unsigned short)
-sd::framework::ConfigurationClassifier::GetC1andC2() const
-sd::framework::ConfigurationClassifier::TraceResourceIdVector(char const*, 
std::__debug::vector,
 
std::allocator
 > > const&) const
-sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Reference
 const&, char const*)
 sd::slidesorter::cache::GenericPageCache::ReleasePreviewBitmap(SdrPage const*)
 
sd::slidesorter::cont

[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/source

2012-04-05 Thread Caolán McNamara

 vcl/source/uipreviewer/previewer.cxx |1 +
 vcl/source/window/builder.cxx|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 17e5b220876ea056fd12d80840cbaa220d163483
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 5 21:28:08 2012 +0100

make dialogs closeable in previewer

diff --git a/vcl/source/uipreviewer/previewer.cxx 
b/vcl/source/uipreviewer/previewer.cxx
index 23aee4a..c1f787b 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -84,6 +84,7 @@ int UIPreviewApp::Main()
 if (pDialog)
 {
 pDialog->SetText(rtl::OUString("LibreOffice ui-previewer"));
+pDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE);
 pDialog->Execute();
 }
 else
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 413e861..98581bc 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -67,7 +67,7 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString &name, bool b
 Window *pWindow = NULL;
 if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkDialog")))
 {
-pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK);
+pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkBox")))
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/source

2012-04-05 Thread Caolán McNamara

 vcl/source/uipreviewer/previewer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e8045af0187b796e636d626aae294b13bb834523
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 5 21:18:01 2012 +0100

set a default title

diff --git a/vcl/source/uipreviewer/previewer.cxx 
b/vcl/source/uipreviewer/previewer.cxx
index 7a27729..23aee4a 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -83,6 +83,7 @@ int UIPreviewApp::Main()
 Dialog *pDialog = dynamic_cast(pWindow);
 if (pDialog)
 {
+pDialog->SetText(rtl::OUString("LibreOffice ui-previewer"));
 pDialog->Execute();
 }
 else
@@ -92,7 +93,7 @@ int UIPreviewApp::Main()
 }
 catch (const uno::Exception &e)
 {
-fprintf(stderr, "fatal error: \n", rtl::OUStringToOString(e.Message, 
osl_getThreadTextEncoding()).getStr());
+fprintf(stderr, "fatal error: %s\n", rtl::OUStringToOString(e.Message, 
osl_getThreadTextEncoding()).getStr());
 }
 return false;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - vcl/qa vcl/source

2012-04-05 Thread Caolán McNamara

 vcl/qa/cppunit/builder/demo.ui |   78 -
 vcl/source/window/builder.cxx  |   22 +--
 2 files changed, 95 insertions(+), 5 deletions(-)

New commits:
commit c53573ac477bbf0a1559cf1e58b67a1d8df93408
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 5 20:43:33 2012 +0100

import GtkGrid

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index a22c17d..ed75074 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -55,6 +55,8 @@
 True
 False
 vertical
+6
+True
 
   
 True
@@ -99,6 +101,7 @@
 True
 â
 an edit 
control
+True
   
   
 False
@@ -110,7 +113,7 @@
   
 False
 True
-1
+2
   
 
 
@@ -246,6 +249,79 @@
 4
   
 
+
+  
+True
+False
+4
+2
+True
+True
+
+  
+True
+False
+cell 1.1
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+True
+False
+1
+cell 3.3
+  
+  
+2
+2
+1
+1
+  
+
+
+  
+True
+False
+A label that spans 
three rows
+  
+  
+0
+1
+3
+1
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+True
+True
+5
+  
+
   
 
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 07f8dcd..413e861 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -83,6 +83,10 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString &name, bool b
 else
 pWindow = new VclHButtonBox(pParent);
 }
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkGrid")))
+{
+pWindow = new VclGrid(pParent);
+}
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton")))
 {
 pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
@@ -357,6 +361,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 {
 name = reader.getAttributeValue(false);
 rtl::OString sKey(name.begin, name.length);
+sKey = sKey.replace('_', '-');
 reader.nextItem(
 xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId);
 rtl::OString sValue(name.begin, name.length);
@@ -371,10 +376,19 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 {
 pCurrent->setChildProperty(sKey, 
static_cast(sValue.toInt32()));
 }
-else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack_type")))
+else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack-type")))
 {
 sal_Int32 nPackType = (sValue[0] == 'e' || sValue[0] == 'e') ? 
VCL_PACK_END : VCL_PACK_START;
-pCurrent->setChildProperty(rtl::OString("pack-type"), 
nPackType);
+pCurrent->setChildProperty(sKey, nPackType);
+}
+else if (
+  sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("left-attach")) 
||
+  sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("top-attach")) ||
+  sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width")) ||
+  sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))
+)
+{
+pCurrent->setChildProperty(sKey, sValue.toInt32());
 }
 else
 fprintf(stderr, "unknown packing %s\n", sKey.getStr());
@@ -396,7 +410,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader 
&reader, stringmap &rMap)
 reader.nextItem(
 xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId);
 rtl::OString sValue(name.begin, name.length);
-rMap[sProperty] = sValue;
+rMap[sProperty] = sValue.replace('_', '-');;
 }
 }
 }
commit c0aba0321b646c51cf0b09ff064d32dd32d41595
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 5 20:41:35 2012 +0100

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

2012-04-05 Thread Caolán McNamara

 vcl/source/gdi/outdev2.cxx |   84 -
 1 file changed, 45 insertions(+), 39 deletions(-)

New commits:
commit 7a9ea6e5696af0816651675d8f7538198cdce4da
Author: Muthu Subramanian 
Date:   Thu Mar 29 16:08:56 2012 +0530

n714787: Duplicate code removal.
(cherry picked from commit 27d9df17c13b22aed7d9194d9dfcf7980b632b3c)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 23a7952..2b2e375 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1623,6 +1623,36 @@ namespace
   (int)nDstAlpha*nDestColor*nSourceAlpha/255 ) / 
(int)nResAlpha : 0;
 return sal_uInt8( c );
 }
+
+inline BitmapColor lcl_AlphaBlend( int nX,   int nY,
+   const longnMapX,
+   const longnMapY,
+   BitmapReadAccess* pP,
+   BitmapReadAccess* pA,
+   BitmapReadAccess* pB,
+   BitmapWriteAccess*pAlphaW,
+   sal_uInt8&nResAlpha )
+{
+BitmapColor aDstCol,aSrcCol;
+aSrcCol = pP->GetColor( nMapY, nMapX );
+aDstCol = pB->GetColor( nY, nX );
+
+// vcl stores transparency, not alpha - invert it
+const sal_uInt8 nSrcAlpha = 255 - pA->GetPixel( nMapY, nMapX 
).GetBlueOrIndex();
+const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixel( nY, nX 
).GetBlueOrIndex();
+
+// Perform porter-duff compositing 'over' operation
+//
+// Co = Cs + Cd*(1-As)
+// Ad = As + Ad*(1-As)
+nResAlpha = (int)nSrcAlpha + (int)nDstAlpha - (int)nDstAlpha*nSrcAlpha/255;
+
+aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(), nSrcAlpha, nDstAlpha, 
nResAlpha, aDstCol.GetRed() ) );
+aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(), nSrcAlpha, nDstAlpha, 
nResAlpha, aDstCol.GetBlue() ) );
+aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(), nSrcAlpha, nDstAlpha, 
nResAlpha, aDstCol.GetGreen() ) );
+
+return aDstCol;
+}
 }
 
 // 
@@ -1638,9 +1668,10 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap  
aBmp,
  const long* pMapX,
  const long* pMapY )
 {
-BitmapColor aDstCol,aSrcCol;
+BitmapColor aDstCol;
 Bitmap  res;
 int nX, nY;
+sal_uInt8   nResAlpha;
 
 OSL_ENSURE(mpAlphaVDev,
"ImplBlendWithAlpha(): call me only with valid alpha VDev!" );
@@ -1673,22 +1704,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap  
aBmp,
 const long  nMapX = pMapX[ nX ];
 const sal_uLong nD = nVCLDitherLut[ nModY | ( nOutX & 
0x0FL ) ];
 
-aSrcCol = pP->GetColor( nMapY, nMapX );
-aDstCol = pB->GetColor( nY, nX );
-
-// vcl stores transparency, not alpha - invert it
-const sal_uInt8 nSrcAlpha = 255 - pA->GetPixel( nMapY, 
nMapX ).GetBlueOrIndex();
-const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixel( nY, 
nX ).GetBlueOrIndex();
-
-// Perform porter-duff compositing 'over' operation
-//
-// Co = Cs + Cd*(1-As)
-// Ad = As + Ad*(1-As)
-const sal_uInt8 nResAlpha = (int)nSrcAlpha + 
(int)nDstAlpha - (int)nDstAlpha*nSrcAlpha/255;
-
-aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(), 
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetRed() ) );
-aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(), 
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetBlue() ) );
-aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(), 
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetGreen() ) );
+aDstCol = lcl_AlphaBlend( nX, nY, nMapX, nMapY, pP, pA, 
pB, pAlphaW, nResAlpha );
 
 aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ 
aDstCol.GetRed() ] + nD ) >> 16UL ] +
   nVCLGLut[ ( nVCLLut[ 
aDstCol.GetGreen() ] + nD ) >> 16UL ] +
@@ -1719,23 +1735,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap  
aBmp,
 for( nX = 0; nX < nDstWidth; nX++ )
 {
 const long nMapX = pMapX[ nX ];
-
-aSrcCol = pP->GetColor( nMapY, nMapX );
-aDstCol = pB->GetColor( nY, nX );
-
-// vcl stores transparency, not alpha - invert it
-const sal_uInt8 nSrcAlpha = 255 - pA->GetPixel( nMapY, 
nMapX ).GetBlueOrIndex();
-const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixel( nY, 
nX ).GetBlue

[Libreoffice-commits] .: sc/source

2012-04-05 Thread Caolán McNamara

 sc/source/filter/oox/formulaparser.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 735a2cba30c55b5aff4883389f65255fb2d07458
Author: CaolÃ¡n McNamara 
Date:   Thu Apr 5 15:43:49 2012 +0100

cppcheck Uninitialized variable

diff --git a/sc/source/filter/oox/formulaparser.cxx 
b/sc/source/filter/oox/formulaparser.cxx
index eeb683f..aa4c0f7 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -2613,6 +2613,7 @@ bool BiffFormulaParserImpl::readNlrSAddrAddData( BiffNlr& 
orNlr, BiffInputStream
 
 bool BiffFormulaParserImpl::readNlrSRangeAddData( BiffNlr& orNlr, bool& 
orbIsRow, BiffInputStream& rStrm )
 {
+orbIsRow = false;
 swapStreamPosition( rStrm );
 // read number of cell addresses and relative flag
 sal_uInt32 nCount;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-05 Thread Caolán McNamara

 sw/source/ui/index/cnttab.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37c1a9fde189f3010eec7392c44404e403555c52
Author: Ivan Timofeev 
Date:   Wed Apr 4 18:38:07 2012 +0400

fdo#40948: TOC dialog, Entries tab: the right arrow button does not work

regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cd.
(cherry picked from commit b49f69aee6f48fb9367a2a9548182dcd84eb5296)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 30f3a84..cb07f71 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3419,7 +3419,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
 {
 //move the right neighbor  to the right edge right aligned
 ctrl_reverse_iterator itRight = it;
---it;
+--itRight;
 Control *pRight = *itRight;
 nMove = nSpace - pRight->GetPosPixel().X() - 
pRight->GetSizePixel().Width();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sd/source

2012-04-05 Thread Caolán McNamara

 sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx   
 |   29 ++
 sd/source/ui/framework/configuration/Configuration.cxx 
 |   18 +--
 sd/source/ui/framework/configuration/ConfigurationClassifier.cxx   
 |   24 +
 sd/source/ui/framework/configuration/ConfigurationController.cxx   
 |   32 +-
 
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx 
|   47 +++---
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx  
 |   43 ++---
 sd/source/ui/framework/module/ModuleController.cxx 
 |   15 ---
 sd/source/ui/tools/TimerBasedTaskExecution.cxx 
 |   15 ---
 sd/source/ui/view/ToolBarManager.cxx   
 |8 -
 9 files changed, 72 insertions(+), 159 deletions(-)

New commits:
commit 45413e32fe643bda1cc1647c8af7eae3309e9c7d
Author: Rob Snelders 
Date:   Wed Apr 4 19:57:05 2012 +0200

Removal VERBOSE

diff --git 
a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx 
b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 92982b7..cbefb08 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -42,18 +42,15 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 
-#undef VERBOSE
-//#define VERBOSE 1
-
 namespace {
 
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL > 0
 
 void TraceRequest (const Reference& rxRequest)
 {
 Reference xNamed (rxRequest, UNO_QUERY);
 if (xNamed.is())
-OSL_TRACE("%s\n",
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":" <<
 ::rtl::OUStringToOString(xNamed->getName(), 
RTL_TEXTENCODING_UTF8).getStr());
 }
 
@@ -105,14 +102,14 @@ void ChangeRequestQueueProcessor::AddRequest (
 {
 ::osl::MutexGuard aGuard (maMutex);
 
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL >= 2
 if (maQueue.empty())
 {
-OSL_TRACE("Adding requests to empty queue");
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Adding requests to empty 
queue");
 ConfigurationTracer::TraceConfiguration(
 mxConfiguration, "current configuration of queue processor");
 }
-OSL_TRACE("Adding request");
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Adding request");
 TraceRequest(rxRequest);
 #endif
 
@@ -131,9 +128,7 @@ void ChangeRequestQueueProcessor::StartProcessing (void)
 && mxConfiguration.is()
 && ! maQueue.empty())
 {
-#ifdef VERBOSE
-OSL_TRACE("ChangeRequestQueueProcessor scheduling processing");
-#endif
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ChangeRequestQueueProcessor 
scheduling processing");
 mnUserEventId = Application::PostUserEvent(
 LINK(this,ChangeRequestQueueProcessor,ProcessEvent));
 }
@@ -168,9 +163,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
 {
 ::osl::MutexGuard aGuard (maMutex);
 
-#ifdef VERBOSE
-OSL_TRACE("ProcessOneEvent");
-#endif
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ProcessOneEvent");
 
 if (mxConfiguration.is()
 && ! maQueue.empty())
@@ -182,7 +175,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
 // Execute the change request.
 if (xRequest.is())
 {
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL >= 2
 TraceRequest(xRequest);
 #endif
 xRequest->execute(mxConfiguration);
@@ -190,14 +183,12 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
 
 if (maQueue.empty())
 {
-#ifdef VERBOSE
-OSL_TRACE("All requests are processed");
-#endif
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": All requests are 
processed");
 // The queue is empty so tell the ConfigurationManager to update
 // its state.
 if (mpConfigurationUpdater.get() != NULL)
 {
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL >= 2
 ConfigurationTracer::TraceConfiguration (
 mxConfiguration, "updating to configuration");
 #endif
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx 
b/sd/source/ui/framework/configuration/Configuration.cxx
index 16b25eb..0e01cc9 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -40,8 +40,6 @@ using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
 using ::rtl::OUString;
 
-#undef VERBOSE
-
 namespace {
 /** Use the XResourceId::compareTo() method to implement a compare operator
 for STL containers.
@@ -163,11 +161,9 @@ void SAL_CALL Configuration::addResource (const 
Reference& rxResour
 
 if (mpResourceContainer->find(rxResourceId) == mpResourceContainer->end())
 {
-#ifdef VERBOSE
-OSL_T

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

2012-04-05 Thread Caolán McNamara

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |  182 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   33 +++-
 2 files changed, 149 insertions(+), 66 deletions(-)

New commits:
commit 830c2151d48e0821b183348c1778856f7d85d296
Author: Miklos Vajna 
Date:   Sat Mar 24 14:55:09 2012 +0100

fdo#47036 fix RTF import of multi-paragraph exact height textboxes

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 16d5c75..2d82e28 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3493,6 +3493,7 @@ RTFFrame::RTFFrame(RTFParserState* pParserState)
 nHoriAnchor(0),
 nVertAlign(0),
 nVertAnchor(0),
+nHRule(NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto),
 nAnchorType(0)
 {
 }
@@ -3580,7 +3581,12 @@ RTFSprms RTFFrame::getSprms()
 break;
 case NS_sprm::LN_PWHeightAbs:
 if ( nH != 0 )
-pValue.reset(new RTFValue(nH));
+{
+if (nHRule == 
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact)
+pValue.reset(new RTFValue(-nH)); // The negative value 
just sets nHRule
+else
+pValue.reset(new RTFValue(nH));
+}
 break;
 case NS_sprm::LN_PDxaWidth:
 if ( nW != 0 )
@@ -3610,12 +3616,8 @@ RTFSprms RTFFrame::getSprms()
 break;
 case NS_ooxml::LN_CT_FramePr_hRule:
 {
-sal_Int32 nHRule = 
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto;
 if ( nH < 0 )
-{
 nHRule = 
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact;
-nH = -nH; // The negative value just sets nHRule
-}
 else if ( nH > 0 )
 nHRule = 
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast;
 pValue.reset(new RTFValue(nHRule));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 3a148f5..9626063 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -214,6 +214,7 @@ namespace writerfilter {
 sal_Int32 nX, nY, nW, nH;
 sal_Int32 nHoriPadding, nVertPadding;
 sal_Int32 nHoriAlign, nHoriAnchor, nVertAlign, nVertAnchor;
+Id nHRule;
 public:
 RTFFrame(RTFParserState* pParserState);
 sal_Int16 nAnchorType;
commit 3e59fa4f3ba1408939e4f937cea29fa614f84b37
Author: Miklos Vajna 
Date:   Sat Mar 24 13:04:54 2012 +0100

fdo#47036 fix RTF import of shapes inside text frames at the start of the 
doc

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aca4519..16d5c75 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3266,6 +3266,12 @@ int RTFDocumentImpl::popState()
 Mapper().startShape(xShape);
 Mapper().endShape();
 }
+else if (m_aStates.top().nDestinationState == DESTINATION_SHAPE && 
m_aStates.top().aFrame.inFrame())
+{
+m_aStates.top().resetFrame();
+parBreak();
+m_bNeedPap = true;
+}
 
 // See if we need to end a track change
 RTFValue::Pointer_t pTrackchange = 
m_aStates.top().aCharacterSprms.find(NS_ooxml::LN_trackchange);
@@ -3493,6 +3499,11 @@ RTFFrame::RTFFrame(RTFParserState* pParserState)
 
 void RTFFrame::setSprm(Id nId, Id nValue)
 {
+if (m_pParserState->m_pDocumentImpl->getFirstRun())
+{
+m_pParserState->m_pDocumentImpl->checkFirstRun();
+m_pParserState->m_pDocumentImpl->setNeedPar(false);
+}
 switch (nId)
 {
 case NS_sprm::LN_PDxaWidth:
commit eff7424629df3fa30afb35c56d9605e77c69241e
Author: Miklos Vajna 
Date:   Sat Mar 24 10:07:40 2012 +0100

rtftok: various refactoring

To allow frame keywords at the start of the document, we need to:
- a single setter method for all frame properties
- make the parser state know about its document
- make the frame know about its parser state

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9600414..aca4519 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -268,7 +268,7 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
 m_xFrame(xFrame),
 m_xStatusIndicator(xStatusIndicator),
 m_nGroup(0),
-m_aDefaultState(),
+m_aDefaultState(this),
 m_bSkipUnknown(false),
 m_aFontEncodings(),
 m_aFontIndexes(),
@@ -413,6 +413,1

[Libreoffice-commits] .: sc/source

2012-04-05 Thread Caolán McNamara

 sc/source/ui/app/scdll.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8ae3e12fa8f1a1410622bc2bea1eccdec86e0acf
Author: Winfried Donkers 
Date:   Thu Apr 5 11:58:32 2012 +0200

remove unused code

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 2d9af16..505e9fd 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -202,7 +202,6 @@ void ScDLL::Init()
 SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE,  
 pMod);
 SvxStyleToolBoxControl  ::RegisterControl(SID_STYLE_APPLY, 
 pMod);
 SvxFontNameToolBoxControl   ::RegisterControl(SID_ATTR_CHAR_FONT,  
 pMod);
-//  SvxFontHeightToolBoxControl 
::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
 SvxColorExtToolBoxControl   ::RegisterControl(SID_ATTR_CHAR_COLOR, 
 pMod);
 SvxColorExtToolBoxControl   ::RegisterControl(SID_BACKGROUND_COLOR,
 pMod);
 SvxFrameToolBoxControl  ::RegisterControl(SID_ATTR_BORDER, 
 pMod);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 4 commits - vcl/qa vcl/source

2012-04-05 Thread Caolán McNamara

 vcl/qa/cppunit/builder/demo.ui |  114 ++---
 vcl/source/window/builder.cxx  |   18 +++---
 2 files changed, 84 insertions(+), 48 deletions(-)

New commits:
commit bc610d9683619c1b9da62ba381f158dcd5ab6ad3
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 4 09:30:41 2012 +0100

implement ListBox dropdown

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 0c0cb7c..a22c17d 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -228,6 +228,17 @@
 0
   
 
+
+  
+True
+False
+  
+  
+True
+True
+1
+  
+
   
   
 False
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 4d02ce3..2780ddf 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -28,12 +28,12 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
+#include 
 
 VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUri)
 {
@@ -85,31 +85,31 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString &name, bool b
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton")))
 {
-pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkRadioButton")))
 {
-pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkCheckButton")))
 {
-pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSpinButton")))
 {
-pWindow = new NumericField(pParent, WB_RIGHT|WB_SPIN|WB_BORDER);
+pWindow = new NumericField(pParent, 
WB_RIGHT|WB_SPIN|WB_BORDER|WB_3DLOOK);
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBox")))
 {
-pWindow = new ComboBox(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new ListBox(pParent, 
WB_DROPDOWN|WB_CENTER|WB_VCENTER|WB_3DLOOK);
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkLabel")))
 {
-pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkEntry")))
 {
-pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER );
+pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK );
 }
 else
 {
commit a86bfdd3b3442996b69d9231444bd6753e73b1f4
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 4 09:12:06 2012 +0100

rearrange demo to help glade out

diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 985c866..0c0cb7c 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -10,69 +10,6 @@
 False
 vertical
 2
-
-  
-True
-False
-
-  
-True
-True
-â
-True
-  
-  
-False
-True
-0
-  
-
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-
-  
-EXPAND
-True
-True
-True
-False
-  
-  
-True
-True
-0
-  
-
-
-  
-FILL
-True
-True
-True
-False
-  
-  
-False
-True
-1
-  
-
-  
-  
-False
-True
-0
-  
-
 
   
 False
@@ -234,6 +171,70 @@
 2
   
 
+
+  
+True
+False
+
+  
+EXPAND
+True
+True
+True
+False
+  
+  
+True
+True
+0
+  
+
+
+  
+FILL
+True
+True
+True
+Fa

[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/inc vcl/source

2012-04-03 Thread Caolán McNamara

 vcl/inc/vcl/fixed.hxx|2 --
 vcl/source/control/fixed.cxx |8 
 vcl/source/uipreviewer/previewer.cxx |   30 ++
 vcl/source/window/builder.cxx|5 +
 vcl/source/window/window.cxx |1 +
 5 files changed, 28 insertions(+), 18 deletions(-)

New commits:
commit e72276e03511add1abffa9d99c884c08fa40b393
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 3 13:08:53 2012 +0100

Implement "visible" from builder. Fix queueResize.

The natural place to call queueResize is from Window::StateChanged
=> instant-beautiful ui-previewer demo. ship it.

diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index 32e116b..a894905 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -74,8 +74,6 @@ public:
 static Size CalcMinimumTextSize( Control const* pControl, long 
nMaxWidth = 0 );
 SizeCalcMinimumSize( long nMaxWidth = 0 ) const;
 virtual SizeGetOptimalSize(WindowSizeType eType) const;
-
-virtual voidSetText( const XubString& rStr );
 };
 
 // -
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 0268295..0606073 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -429,14 +429,6 @@ void  FixedText::FillLayoutData() const
 ImplDraw( const_cast(this), 0, Point(), GetOutputSizePixel(), 
true );
 }
 
-
-void FixedText::SetText( const XubString& rStr )
-{
-Window::SetText(rStr);
-//Text changed, tell possibly existing layout that size requisition has 
changed
-queueResize();
-}
-
 // ===
 
 void FixedLine::ImplInit( Window* pParent, WinBits nStyle )
diff --git a/vcl/source/uipreviewer/previewer.cxx 
b/vcl/source/uipreviewer/previewer.cxx
index 9f3bdb2..7a27729 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -49,7 +50,11 @@ int UIPreviewApp::Main()
 {
 std::vector uifiles;
 for (sal_uInt16 i = 0; i < GetCommandLineParamCount(); ++i)
-uifiles.push_back(GetCommandLineParam(i));
+{
+rtl::OUString aFileUrl;
+osl::File::getFileURLFromSystemPath(GetCommandLineParam(i), aFileUrl);
+uifiles.push_back(aFileUrl);
+}
 
 if (uifiles.empty())
 {
@@ -71,17 +76,26 @@ int UIPreviewApp::Main()
 aArgs[ 1 ] <<= 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
 ::ucbhelper::ContentBroker::initialize(xSFactory, aArgs);
 
-VclBuilder aBuilder(NULL, uifiles[0]);
-Window *pWindow = aBuilder.get_widget_root();
-Dialog *pDialog = dynamic_cast(pWindow);
-if (pDialog)
+try
 {
-pDialog->Execute();
+VclBuilder aBuilder(NULL, uifiles[0]);
+Window *pWindow = aBuilder.get_widget_root();
+Dialog *pDialog = dynamic_cast(pWindow);
+if (pDialog)
+{
+pDialog->Execute();
+}
+else
+{
+fprintf(stderr, "to-do: no toplevel dialog, make one\n");
+}
 }
-else
+catch (const uno::Exception &e)
 {
-fprintf(stderr, "to-do: no toplevel dialog, make one\n");
+fprintf(stderr, "fatal error: \n", rtl::OUStringToOString(e.Message, 
osl_getThreadTextEncoding()).getStr());
 }
+return false;
+
 
 ::ucbhelper::ContentBroker::deinitialize();
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index ac89bfd..71f9e04 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -142,6 +142,11 @@ Window *VclBuilder::insertObject(Window *pParent, const 
rtl::OString &rClass, st
 const rtl::OString &rValue = aI->second;
 if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("label")))
 pCurrentChild->SetText(rtl::OStringToOUString(rValue, 
RTL_TEXTENCODING_UTF8));
+else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("visible")))
+{
+bool bIsVisible = (rValue[0] == 't' || rValue[0] == 'T' || 
rValue[0] == '1');
+pCurrentChild->Show(bIsVisible);
+}
 else if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("xalign")))
 {
 WinBits nBits = pCurrentChild->GetStyle();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bf251be..dfb839f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4927,6 +4927,7 @@ void Window::UserEvent( sal_uLong, void* )
 
 void Window::StateChanged( StateChangedType )
 {
+queueResize();
 DBG_CHKTHIS( Window, ImplDbgCheckWindow );
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-04-02 Thread Caolán McNamara

 svx/source/tbxctrls/linectrl.cxx |4 ++--
 svx/source/tbxctrls/tbcontrl.cxx |6 +++---
 sw/source/filter/ww8/ww8par.hxx  |1 +
 sw/source/filter/ww8/ww8par6.cxx |   19 ++-
 4 files changed, 20 insertions(+), 10 deletions(-)

New commits:
commit a482b89e4d9c41b6f7c1616d193ac6cde05a69a7
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 2 20:57:02 2012 +0100

Resolves: fdo#48096 torn off popups trigger keyboard focus problems

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c81177e..ccc047c 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -379,7 +379,7 @@ SvxLineEndWindow::SvxLineEndWindow(
 const String& rWndTitle ) :
 SfxPopupWindow( nSlotId,
 rFrame,
-WinBits( WB_STDPOPUP ) ),
+WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
 aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | 
WB_NO_DIRECTSELECT ) ),
 nCols   ( 2 ),
 nLines  ( 12 ),
@@ -400,7 +400,7 @@ SvxLineEndWindow::SvxLineEndWindow(
 SfxPopupWindow( nSlotId,
 rFrame,
 pParentWindow,
-WinBits( WB_STDPOPUP ) ),
+WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
 aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | 
WB_NO_DIRECTSELECT ) ),
 nCols   ( 2 ),
 nLines  ( 12 ),
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index cb56fac..f9f25a8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -822,7 +822,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&   
 rCommand,
   Window*
pParentWindow,
   const ::Color  
rLastColor ) :
 
-SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_OWNERDRAWDECORATION ) ),
 
 theSlotId( nSlotId ),
 aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | 
WB_NO_DIRECTSELECT) ),
@@ -1049,7 +1049,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, 
SfxItemState eState, co
 
 SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< 
XFrame >& rFrame, Window* pParentWindow ) :
 
-SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_OWNERDRAWDECORATION ) ),
 aFrameSet   ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | 
WB_NO_DIRECTSELECT ) ),
 bParagraphMode(sal_False)
 
@@ -1326,7 +1326,7 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
 
 SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< 
XFrame >& rFrame, Window* pParentWindow ) :
 
-SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_AUTOSIZE ) ),
+SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | 
WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ),
 m_aLineStyleLb( this )
 {
 try
commit b89e0c5b56e50ff62d0e5defdf9fe92620cc877a
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 2 16:56:54 2012 +0100

split out ContextualSpacing

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index b86c5b6..7b4ec8e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1588,6 +1588,7 @@ public: // eigentlich private, geht aber leider nur 
public
 void Read_UL(   sal_uInt16 nId, const sal_uInt8*, short nLen );
 void Read_ParaAutoBefore(sal_uInt16 , const sal_uInt8 *pData, short nLen);
 void Read_ParaAutoAfter(sal_uInt16 , const sal_uInt8 *pData, short nLen);
+void Read_ParaContextualSpacing( sal_uInt16 nId, const sal_uInt8* pData, 
short nLen );
 void Read_LineSpace(sal_uInt16, const sal_uInt8*, short nLen );
 void Read_Justify(sal_uInt16, const sal_uInt8*, short nLen);
 void Read_IdctHint(sal_uInt16, const sal_uInt8*, short nLen);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 65cea9d..33baeb7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4177,7 +4177,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const 
sal_uInt8* pData, short nLe
 pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
 return;
 }
-short nPara = ((nId == 0x246D) ? SVBT16ToShort( pData ) : (0 != *pData));
+short nPara = SVBT16ToShort( pData );
 if( nPara < 0 )
 nPara = -nPara;
 
@@ -4195,9 +4195,6 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const 
sal_uInt8* pData, short nLe
 case 0xA414:
 aUL.SetLower( nPara );
 break;
-case 0x246D:
-aUL.SetContextValue( nPara );
-

[Libreoffice-commits] .: 2 commits - oox/inc oox/source unusedcode.easy

2012-03-29 Thread Caolán McNamara

 oox/inc/oox/dump/dffdumper.hxx   |1 
 oox/inc/oox/dump/dumperbase.hxx  |   12 ---
 oox/inc/oox/dump/oledumper.hxx   |1 
 oox/inc/oox/ole/vbaprojectfilter.hxx |   15 -
 oox/source/dump/dffdumper.cxx|6 ---
 oox/source/dump/dumperbase.cxx   |   53 ---
 oox/source/dump/oledumper.cxx|5 ---
 oox/source/ole/vbaprojectfilter.cxx  |   19 
 unusedcode.easy  |   12 ---
 9 files changed, 124 deletions(-)

New commits:
commit 8a8532181a66548aea79da73745dcac785f133d8
Author: CaolÃ¡n McNamara 
Date:   Thu Mar 29 21:07:04 2012 +0100

drop extra unused inlines and remains of unconstructable class

diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 0dd1abc..ef95a79 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1150,8 +1150,6 @@ public:
 mrOut( *rxOut ) { mrOut.startTable( nW1 ); }
 inline explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1, 
sal_Int32 nW2 ) :
 mrOut( *rxOut ) { mrOut.startTable( nW1, nW2 ); }
-inline explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1, 
sal_Int32 nW2, sal_Int32 nW3 ) :
-mrOut( *rxOut ) { mrOut.startTable( nW1, nW2, nW3 
); }
 inline explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1, 
sal_Int32 nW2, sal_Int32 nW3, sal_Int32 nW4 ) :
 mrOut( *rxOut ) { mrOut.startTable( nW1, nW2, nW3, 
nW4 ); }
 inline explicit TableGuard( const OutputRef& rxOut, size_t nColCount,
diff --git a/oox/inc/oox/ole/vbaprojectfilter.hxx 
b/oox/inc/oox/ole/vbaprojectfilter.hxx
index 50c6e3e..8cc029b 100644
--- a/oox/inc/oox/ole/vbaprojectfilter.hxx
+++ b/oox/inc/oox/ole/vbaprojectfilter.hxx
@@ -56,16 +56,6 @@ private:
 ::rtl::OUString maStorageName;
 };
 
-// 
-
-class WordVbaProjectFilter : public VbaProjectFilterBase
-{
-private:
-virtual ::rtl::OUString implGetImplementationName() const;
-};
-
-// 
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/vbaprojectfilter.cxx 
b/oox/source/ole/vbaprojectfilter.cxx
index 5f993ed..23ca438 100644
--- a/oox/source/ole/vbaprojectfilter.cxx
+++ b/oox/source/ole/vbaprojectfilter.cxx
@@ -72,20 +72,6 @@ VbaProject* VbaProjectFilterBase::implCreateVbaProject() 
const
 
 // 
 
-OUString SAL_CALL WordVbaProjectFilter_getImplementationName() throw()
-{
-return CREATE_OUSTRING( "com.sun.star.comp.oox.WordVbaProjectFilter" );
-}
-
-// 
-
-OUString WordVbaProjectFilter::implGetImplementationName() const
-{
-return WordVbaProjectFilter_getImplementationName();
-}
-
-// 
-
 } // namespace ole
 } // namespace oox
 
commit 4b7e6d6eabed6ef6a3916bbd8376a24a7248f009
Author: Petr Vorel 
Date:   Thu Mar 29 11:54:36 2012 +0200

remove unused code (oox)

diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx
index 10f84f3..de0913f 100644
--- a/oox/inc/oox/dump/dffdumper.hxx
+++ b/oox/inc/oox/dump/dffdumper.hxx
@@ -49,7 +49,6 @@ protected:
 inline explicit DffStreamObject() {}
 
 using   SequenceRecordObjectBase::construct;
-voidconstruct( const OutputObjectBase& rParent, const 
BinaryInputStreamRef& rxStrm );
 
 virtual boolimplReadRecordHeader( BinaryInputStream& rBaseStrm, 
sal_Int64& ornRecId, sal_Int64& ornRecSize );
 virtual voidimplWriteExtHeader();
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index a8b16b0..0dd1abc 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -231,7 +231,6 @@ struct ItemFormat
 explicitItemFormat();
 
 voidset( DataType eDataType, FormatType eFmtType, const 
::rtl::OUString& rItemName );
-voidset( DataType eDataType, FormatType eFmtType, const 
::rtl::OUString& rItemName, const ::rtl::OUString& rListName );
 
 /** Initializes the struct from a vector of strings containing the item 
format.
 
@@ -398,7 +397,6 @@ public:
 static void appendToken( ::rtl::OUStringBuffer& rStr, const 
::rtl::OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
 static void appendToken( ::rtl::OUStringBuffer& rStr, sal_Int64 
nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
 static void prependToken( ::rtl::OUStringBuffer& rStr, const 
::rtl::OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-static void prependToken( ::rtl::OUStringBuf

[Libreoffice-commits] .: 3 commits - connectivity/inc connectivity/source unusedcode.easy

2012-03-29 Thread Caolán McNamara

 connectivity/inc/connectivity/FValue.hxx   |2 
 connectivity/inc/connectivity/sqlnode.hxx  |2 
 connectivity/inc/connectivity/sqlparse.hxx |1 
 connectivity/source/commontools/FValue.cxx |   94 -
 connectivity/source/commontools/TSortIndex.cxx |   13 ---
 connectivity/source/inc/TSortIndex.hxx |5 -
 connectivity/source/parse/sqlnode.cxx  |   41 --
 unusedcode.easy|5 -
 8 files changed, 163 deletions(-)

New commits:
commit 63940b9214e5f1f44b74aaf689f5ee43f5473e0e
Author: Santiago Martinez 
Date:   Wed Mar 28 21:48:52 2012 +0200

Remove unused code in connectiviy.

diff --git a/connectivity/inc/connectivity/FValue.hxx 
b/connectivity/inc/connectivity/FValue.hxx
index 64f44d4..db46884 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -330,8 +330,6 @@ namespace connectivity
 sal_Int64   getLong()   const;
 double  getDouble() const;
 float   getFloat() const;
-// convert the double to the type _nDataType
-voidsetFromDouble(const double& _rVal,sal_Int32 
_nDatatype);
 
 ::rtl::OUString getString() const;  // makes a automatic 
conversion if type isn't a string
 ::com::sun::star::util::DategetDate()   const;
diff --git a/connectivity/source/commontools/FValue.cxx 
b/connectivity/source/commontools/FValue.cxx
index acd1ef0..2de9ea3 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1616,100 +1616,6 @@ double ORowSetValue::getDouble()const
 }
 return nRet;
 }
-// -
-void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype)
-{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "ocke.jans...@sun.com", 
"ORowSetValue::setFromDouble" );
-free();
-
-m_bNull = sal_False;
-switch(_nDatatype)
-{
-case DataType::CHAR:
-case DataType::VARCHAR:
-case DataType::DECIMAL:
-case DataType::NUMERIC:
-case DataType::LONGVARCHAR:
-{
-::rtl::OUString aVal = ::rtl::OUString::valueOf(_rVal);
-m_aValue.m_pString = aVal.pData;
-rtl_uString_acquire(m_aValue.m_pString);
-}
-break;
-case DataType::BIGINT:
-if ( m_bSigned )
-{
-m_aValue.m_pValue = new sal_Int64((sal_Int64)_rVal);
-TRACE_ALLOC( sal_Int64 )
-}
-else
-{
-::rtl::OUString aVal = ::rtl::OUString::valueOf(_rVal);
-m_aValue.m_pString = aVal.pData;
-rtl_uString_acquire(m_aValue.m_pString);
-}
-break;
-case DataType::FLOAT:
-m_aValue.m_pValue = new float((float)_rVal);
-TRACE_ALLOC( float )
-break;
-case DataType::DOUBLE:
-case DataType::REAL:
-m_aValue.m_pValue = new double(_rVal);
-TRACE_ALLOC( double )
-break;
-case DataType::DATE:
-m_aValue.m_pValue = new 
Date(dbtools::DBTypeConversion::toDate(_rVal));
-TRACE_ALLOC( Date )
-break;
-case DataType::TIME:
-m_aValue.m_pValue = new 
Time(dbtools::DBTypeConversion::toTime(_rVal));
-TRACE_ALLOC( Time )
-break;
-case DataType::TIMESTAMP:
-m_aValue.m_pValue = new 
DateTime(dbtools::DBTypeConversion::toDateTime(_rVal));
-TRACE_ALLOC( DateTime )
-break;
-case DataType::BINARY:
-case DataType::VARBINARY:
-case DataType::LONGVARBINARY:
-case DataType::BLOB:
-case DataType::CLOB:
-OSL_ASSERT(!"setFromDouble() for this type is not allowed!");
-break;
-case DataType::BIT:
-case DataType::BOOLEAN:
-m_aValue.m_bBool = _rVal != 0.0;
-break;
-case DataType::TINYINT:
-if ( m_bSigned )
-m_aValue.m_nInt8 = sal_Int8(_rVal);
-else
-m_aValue.m_nInt16 = sal_Int16(_rVal);
-break;
-case DataType::SMALLINT:
-if ( m_bSigned )
-m_aValue.m_nInt16 = sal_Int16(_rVal);
-else
-m_aValue.m_nInt32 = sal_Int32(_rVal);
-break;
-case DataType::INTEGER:
-if ( m_bSigned )
-m_aValue.m_nInt32 = sal_Int32(_rVal);
-else
-{
-m_aValue.m_pValue = new sal_Int64((sal_Int64)_rVal);
-TRACE_ALLOC( sal_Int64 )
-}
-break;
-default:
-{
-m_aValue.m_pValue = new Any(_rVal);
-break;
-

[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/source

2012-03-29 Thread Caolán McNamara

 vcl/source/window/builder.cxx |5 +
 vcl/source/window/layout.cxx  |4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 84d4523539e06f6f40ad01b5dc404208d332d1e1
Author: CaolÃ¡n McNamara 
Date:   Thu Mar 29 10:27:27 2012 +0100

fix pack-end and import pack-type

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bf66d05..ac89bfd 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -366,6 +366,11 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 {
 pCurrent->setChildProperty(sKey, 
static_cast(sValue.toInt32()));
 }
+else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack_type")))
+{
+sal_Int32 nPackType = (sValue[0] == 'e' || sValue[0] == 'e') ? 
VCL_PACK_END : VCL_PACK_START;
+pCurrent->setChildProperty(rtl::OString("pack-type"), 
nPackType);
+}
 else
 fprintf(stderr, "unknown packing %s\n", sKey.getStr());
 }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f5d8b41..9d2f2be 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -133,9 +133,9 @@ void VclBox::setAllocation(const Size &rAllocation)
 rtl::OString sPackType(RTL_CONSTASCII_STRINGPARAM("pack-type"));
 rtl::OString sFill(RTL_CONSTASCII_STRINGPARAM("fill"));
 
-Point aPos(nBorderWidth, nBorderWidth);
 for (sal_Int32 ePackType = VCL_PACK_START; ePackType <= VCL_PACK_END; 
++ePackType)
 {
+Point aPos(nBorderWidth, nBorderWidth);
 if (ePackType == VCL_PACK_END)
 {
 long nPrimaryCoordinate = getPrimaryCoordinate(aPos);
@@ -197,7 +197,7 @@ void VclBox::setAllocation(const Size &rAllocation)
 {
 setPrimaryCoordinate(aPos, nPrimaryCoordinate - nDiff);
 setPrimaryCoordinate(aChildPos, 
getPrimaryCoordinate(aChildPos) -
-getPrimaryDimension(aChildSize));
+getPrimaryDimension(aBoxSize));
 }
 
 pChild->SetPosSizePixel(aChildPos, aChildSize);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-28 Thread Caolán McNamara

 connectivity/source/commontools/dbtools2.cxx |   73 ++-
 1 file changed, 62 insertions(+), 11 deletions(-)

New commits:
commit 01790af488fad56f0600fc755ee9e976e3aa3a5f
Author: Lionel Elie Mamane 
Date:   Tue Mar 27 10:49:49 2012 +0200

fdo#47937: copy column privileges into table privileges

diff --git a/connectivity/source/commontools/dbtools2.cxx 
b/connectivity/source/commontools/dbtools2.cxx
index 63492b4..6d37f99 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -675,19 +675,20 @@ sal_Int32 getTablePrivileges(const Reference< 
XDatabaseMetaData>& _xMetaData,
 Reference< XResultSet > xPrivileges = 
_xMetaData->getTablePrivileges(aVal, _sSchema, _sTable);
 Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY);
 
+const ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName();
+static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( 
"SELECT" ));
+static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( 
"INSERT" ));
+static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( 
"UPDATE" ));
+static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( 
"DELETE" ));
+static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( 
"READ" ));
+static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( 
"CREATE" ));
+static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( 
"ALTER" ));
+static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( 
"REFERENCE" ));
+static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( 
"DROP" ));
+
 if ( xCurrentRow.is() )
 {
-::rtl::OUString sUserWorkingFor = _xMetaData->getUserName();
-static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( 
"SELECT" ));
-static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( 
"INSERT" ));
-static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( 
"UPDATE" ));
-static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( 
"DELETE" ));
-static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( 
"READ" ));
-static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( 
"CREATE" ));
-static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( 
"ALTER" ));
-static const ::rtl::OUString sREFERENCE( 
RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" ));
-static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( 
"DROP" ));
-// after creation the set is positioned before the first record, 
per definitionem
+// after creation the set is positioned before the first record, 
per definition
 #ifdef DBG_UTIL
 Reference< XResultSetMetaDataSupplier > 
xSup(xPrivileges,UNO_QUERY);
 if ( xSup.is() )
@@ -744,6 +745,56 @@ sal_Int32 getTablePrivileges(const Reference< 
XDatabaseMetaData>& _xMetaData,
 }
 }
 disposeComponent(xPrivileges);
+
+// Some drivers put a table privilege as soon as any column has the 
privilege,
+// some drivers only if all columns have the privilege.
+// To unifiy the situation, collect column privileges here, too.
+Reference< XResultSet > xColumnPrivileges = 
_xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
+Reference< XRow > xColumnCurrentRow(xColumnPrivileges, UNO_QUERY);
+if ( xColumnCurrentRow.is() )
+{
+// after creation the set is positioned before the first record, 
per definition
+::rtl::OUString sPrivilege, sGrantee;
+while ( xColumnPrivileges->next() )
+{
+#ifdef DBG_UTIL
+::rtl::OUString sCat, sSchema, sTableName, sColumnName, 
sGrantor, sGrantable;
+sCat= xColumnCurrentRow->getString(1);
+sSchema = xColumnCurrentRow->getString(2);
+sTableName  = xColumnCurrentRow->getString(3);
+sColumnName = xColumnCurrentRow->getString(4);
+sGrantor= xColumnCurrentRow->getString(5);
+#endif
+sGrantee= xColumnCurrentRow->getString(6);
+sPrivilege  = xColumnCurrentRow->getString(7);
+#ifdef DBG_UTIL
+sGrantable  = xColumnCurrentRow->getString(8);
+#endif
+
+if (!sUserWorkingFor.equalsIgnoreAsciiCase(sGrantee))
+continue;
+
+if (sPrivilege.equalsIgnoreAsciiCase(sSELECT))
+nPrivileges |= Privilege::SELECT;
+else if (sPrivilege.equalsIgnoreAsciiCase(sINSERT))
+nPrivileges |= Privilege::INSERT;
+else if (sPrivilege.equalsIgnoreAsciiCase(sUPDATE))
+nPrivilege

[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/inc vcl/qa vcl/source

2012-03-28 Thread Caolán McNamara

 vcl/inc/vcl/window.hxx |2 
 vcl/qa/cppunit/builder/demo.ui |  116 -
 vcl/source/window/builder.cxx  |   21 +++
 vcl/source/window/window.cxx   |   32 +++
 4 files changed, 113 insertions(+), 58 deletions(-)

New commits:
commit 43b1a06faf7bde3e04be95f6e6c35bd3926da52e
Author: CaolÃ¡n McNamara 
Date:   Wed Mar 28 14:10:13 2012 +0100

allow reordering widget according to packing::position

diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index d6028b7..625e9f5 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1098,6 +1098,8 @@ public:
 return nValue;
 }
 
+void reorderWithinParent(sal_uInt16 nNewPosition);
+
 //-
 //  Native Widget Rendering functions
 //-
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 786ad76..044a45e 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -49,64 +49,6 @@
 0
   
 
-
-  
-True
-False
-
-  
-button
-True
-True
-True
-False
-  
-  
-False
-True
-0
-  
-
-
-  
-radiobutton
-True
-True
-False
-False
-0
-True
-True
-  
-  
-False
-True
-1
-  
-
-
-  
-checkbutton
-True
-True
-False
-False
-0
-True
-  
-  
-False
-True
-2
-  
-
-  
-  
-False
-True
-0
-  
-
 
   
 False
@@ -210,6 +152,64 @@
 1
   
 
+
+  
+True
+False
+
+  
+button
+True
+True
+True
+False
+  
+  
+False
+True
+0
+  
+
+
+  
+radiobutton
+True
+True
+False
+False
+0
+True
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+checkbutton
+True
+True
+False
+False
+0
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+2
+  
+
   
 
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index cbfc274..bf66d05 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -206,6 +206,23 @@ void VclBuilder::handleChild(Window *pParent, 
xmlreader::XmlReader &reader)
 if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")))
 {
 pCurrentChild = handleObject(pParent, reader);
+
+if (pCurrentChild)
+{
+rtl::OString 
sPosition(RTL_CONSTASCII_STRINGPARAM("position"));
+std::vector aChilds;
+for (Window* pChild = 
pCurrentChild->GetWindow(WINDOW_FIRSTCHILD); pChild;
+pChild = pChild->GetWindow(WINDOW_NEXT))
+{
+aChilds.push_back(pChild);
+}
+
+for (size_t i = 0; i < aChilds.size(); ++i)
+{
+sal_uInt16 nPosition = 
aChilds[i]->getWidgetProperty(sPosition);
+aChilds[i]->reorderWithinParent(nPosition);
+}
+}
 }
 else if (name.equals(RTL_CONSTASCII_STRINGPARAM("packing")))
 {
@@ -345,6 +362,10 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 bool bTrue = (sValue[0] == 't' || sValue[0] == 'T' || 
sValue[0] == '1');
 pCurrent->setChildProperty(sKey, bTrue);
 }
+else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("position")))
+{
+pCurren

[Libreoffice-commits] .: 4 commits - editeng/source filter/inc filter/source l10ntools/source sc/source sd/source svx/source sw/source unusedcode.easy

2012-03-27 Thread Caolán McNamara

 editeng/source/items/paraitem.cxx   |2 
 filter/inc/filter/msfilter/svdfppt.hxx  |2 
 filter/source/msfilter/svdfppt.cxx  |2 
 l10ntools/source/localize.cxx   |1 
 sc/source/filter/inc/addressconverter.hxx   |   16 --
 sc/source/filter/inc/biffdetector.hxx   |   38 -
 sc/source/filter/inc/biffoutputstream.hxx   |2 
 sc/source/filter/inc/drawingmanager.hxx |2 
 sc/source/filter/inc/excelfilter.hxx|   17 --
 sc/source/filter/inc/ooxformulaparser.hxx   |  111 
 sc/source/filter/oox/addressconverter.cxx   |   29 
 sc/source/filter/oox/biffdetector.cxx   |   81 ---
 sc/source/filter/oox/biffoutputstream.cxx   |8 -
 sc/source/filter/oox/drawingmanager.cxx |   25 ---
 sc/source/filter/oox/excelfilter.cxx|   53 ---
 sc/source/filter/oox/ooxformulaparser.cxx   |   90 
 sc/source/filter/oox/sheetdatabuffer.cxx|   75 --
 sd/source/filter/eppt/epptso.cxx|4 
 sd/source/filter/ppt/pptin.cxx  |   17 +-
 svx/source/accessibility/svxrectctaccessiblecontext.cxx |6 
 sw/source/core/layout/paintfrm.cxx  |   22 +--
 unusedcode.easy |8 -
 22 files changed, 48 insertions(+), 563 deletions(-)

New commits:
commit 9cab649ccb3d827258e95a9b5c91d4b726564d89
Author: CaolÃ¡n McNamara 
Date:   Tue Mar 27 22:36:52 2012 +0100

Resolves: fdo#47865 insertions into deque invalidate nLastCount

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 286908a..beb44dd 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -191,9 +191,9 @@ public:
 
 class SwLineRects : public std::deque< SwLineRect >
 {
-std::deque< SwLineRect >::iterator nLastCount;  //avoid unnecessary cycles 
in PaintLines
+size_t nLastCount;  //avoid unnecessary cycles in PaintLines
 public:
-SwLineRects() : nLastCount( this->begin() ) {}
+SwLineRects() : nLastCount( 0 ) {}
 void AddLineRect( const SwRect& rRect,  const Color *pColor, const 
SvxBorderStyle nStyle,
   const SwTabFrm *pTab, const sal_uInt8 nSCol );
 void ConnectEdges( OutputDevice *pOut );
@@ -827,7 +827,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
 {
 // Paint the borders. Sadly two passes are needed.
 // Once for the inside and once for the outside edges of tables
-if ( this->end() != nLastCount )
+if ( this->size() != nLastCount )
 {
 // #i16816# tagged pdf support
 SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut );
@@ -839,18 +839,18 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
 const Color *pLast = 0;
 
 sal_Bool bPaint2nd = sal_False;
-SwLineRects::iterator nMinCount = this->end();
+size_t nMinCount = this->size();
 
-for (SwLineRects::iterator it = this->begin(); it != this->end(); ++it)
+for ( size_t i = 0; i < size(); ++i )
 {
-SwLineRect &rLRect = *it;
+SwLineRect &rLRect = operator[](i);
 
 if ( rLRect.IsPainted() )
 continue;
 
 if ( rLRect.IsLocked() )
 {
-nMinCount = Min( nMinCount, it );
+nMinCount = Min( nMinCount, i );
 continue;
 }
 
@@ -905,15 +905,16 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
 bPaint2nd = sal_True;
 }
 if ( bPaint2nd )
-for (SwLineRects::iterator it = this->begin(); it != this->end(); 
++it)
+{
+for ( size_t i = 0; i < size(); ++i )
 {
-SwLineRect &rLRect = *it;
+SwLineRect &rLRect = operator[](i);
 if ( rLRect.IsPainted() )
 continue;
 
 if ( rLRect.IsLocked() )
 {
-nMinCount = Min( nMinCount, it );
+nMinCount = Min( nMinCount, i );
 continue;
 }
 
@@ -935,6 +936,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
 lcl_DrawDashedRect( pOut, rLRect );
 rLRect.SetPainted();
 }
+}
 nLastCount = nMinCount;
 pOut->Pop();
 }
commit 919f7104b51b156db34787eb7bd5f16e4ecfb633
Author: CaolÃ¡n McNamara 
Date:   Tue Mar 27 22:02:36 2012 +0100

drop intermediate temporary UniStrings

diff --git a/editeng/source/items/paraitem.cxx 
b/editeng/source/items/paraitem.cxx
index d7736d1..b1ab1fd 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -887,7 +887,7 @@ XubString SvxTabSto

[Libreoffice-commits] .: l10ntools/inc l10ntools/source unusedcode.easy

2012-03-27 Thread Caolán McNamara

 l10ntools/inc/xmlparse.hxx|6 
 l10ntools/source/xmlparse.cxx |   61 --
 unusedcode.easy   |2 -
 3 files changed, 69 deletions(-)

New commits:
commit a84e97e58fe0915376801f98e1c0d24470f1e1d3
Author: Santiago Martinez 
Date:   Tue Mar 27 21:16:50 2012 +0200

Remove unused code in l10ntools.

diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index cd9bc2b..0731a9f 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -169,13 +169,7 @@ public:
 XMLChildNode *pChild , size_t pos   /// the new child
 );
 
-int RemoveChild( XMLElement *pRefElement );
 void RemoveAndDeleteAllChildren();
-
-/// returns a child element which matches the given one
-XMLElement *GetChildElement(
-XMLElement *pRefElement // the reference elelement
-);
 };
 
 //-
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index e646308..5be1f0e 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -159,37 +159,6 @@ void XMLParentNode::AddChild( XMLChildNode *pChild , 
size_t pos )
 }
 
 /*/
-int XMLParentNode::RemoveChild( XMLElement *pRefElement )
-/*/
-{
-XMLElement* a;
-if ( pChildList ){
-for ( size_t i = 0; i < pChildList->size(); i++ ) {
-XMLChildNode *pChild = (*pChildList)[ i ];
-if ( pChild->GetNodeType() == XML_NODE_TYPE_ELEMENT ){
-a = static_cast(pChild);
-rtl::OString elemid(a->GetId().toAsciiLowerCase());
-rtl::OString elemLID(a->GetLanguageId().toAsciiLowerCase());
-rtl::OString pRefLID(
-pRefElement->GetLanguageId().toAsciiLowerCase());
-if (elemid == pRefElement->GetId() && elemLID == pRefLID)
-{
-if( pRefElement->ToOString().compareTo( a->ToOString() 
)==0 ){
-XMLChildNodeList::iterator it = pChildList->begin();
-::std::advance( it, i );
-pChildList->erase( it );
-delete a; // Test
-return i;
-}
-}
-}
-
-}
-}
-return -1;
-}
-
-/*/
 void XMLParentNode::RemoveAndDeleteAllChildren(){
 /*/
 if ( pChildList ) {
@@ -199,36 +168,6 @@ void XMLParentNode::RemoveAndDeleteAllChildren(){
 }
 }
 
-/*/
-XMLElement *XMLParentNode::GetChildElement( XMLElement *pRefElement )
-/*/
-{
-for ( size_t i = 0; i < pChildList->size(); i++ ) {
-XMLChildNode *pChild = (*pChildList)[ i ];
-if ( pChild->GetNodeType() == XML_NODE_TYPE_ELEMENT )
-if ((( XMLElement * ) pChild )->GetName() ==
-pRefElement->GetName())
-{
-XMLAttributeList *pList = pRefElement->GetAttributeList();
-if ( !pList )
-return ( XMLElement * ) pChild;
-
-sal_Bool bMatch = sal_False;
-for ( size_t j = 0; j < pList->size() && bMatch; j++ ) {
-XMLAttribute *pAttribute = (*pList)[ j ];
-XMLAttribute *pCandidate =
-(( XMLElement * ) pChild )->GetAttribute(
-pAttribute->GetName() );
-if ( !pCandidate || !pAttribute->IsEqual( *pCandidate ))
-bMatch = sal_False;
-}
-if ( bMatch )
-return ( XMLElement * ) pChild;
-}
-}
-return NULL;
-}
-
 //
 // class XMLFile
 //
diff --git a/unusedcode.easy b/unusedcode.easy
index 54ba512..79a729f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -341,8 +341,6 @@ XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
 XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
 XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
 XMLParentNode::AddChild(XMLChildNode*, unsigned long)
-XMLParentNode::GetChildElement(XMLElement*)
-XMLParentNode::RemoveChild(XMLElement*)
 XMLPropertyBackpatcher::XMLPropertyBackpatcher(char const*)
 XMLPropertyBackpatcher::XMLPropertyBackpatcher(char const*, 
char const*, unsigned char, rtl::OUString)
 XMLPropertyBackpatcher::XMLPropertyBackpatcher(rtl::OUString 
const&, rtl::OUString const&, unsigned char, rtl::OUString)
___

1 2 3 4 5 6 7 >

1 - 100 of 685 matches

Mail list logo