[Libreoffice-commits] .: filter/source

2012-03-15 Thread Lubos Lunak 
 filter/source/graphicfilter/icgm/bitmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3297ce2aa13efc6029983b716cec20ed7befda56
Author: Luboš Luňák 
Date:   Fri Mar 16 03:24:22 2012 +0100

0x8001 can't fit into (signed) long

As far as I can say, this value and all those negative values
are actually not valid in CGM anyway, but since I do not know
the code, I'm leaving them in, they shouldn't break anything.

diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx 
b/filter/source/graphicfilter/icgm/bitmap.cxx
index d614443..bc84135 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -256,7 +256,7 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& 
rDesc )
 rDesc.mnScanSize = 0;
 switch( rDesc.mnLocalColorPrecision )
 {
-case 0x8001 :   // monochrome ( bit = 
0->backgroundcolor )
+case long(0x8001) : // monochrome ( bit = 
0->backgroundcolor )
 case 0 ://  bit = 
1->fillcolor
 rDesc.mnDstBitsPerPixel = 1;
 break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Kohei Yoshida 
 sc/inc/dpcache.hxx  |   16 
 sc/source/core/data/dpcache.cxx |   31 ++-
 2 files changed, 6 insertions(+), 41 deletions(-)

New commits:
commit 0c1a63b1fbbd9540a724f6918675a5559b19c156
Author: Kohei Yoshida 
Date:   Thu Mar 15 20:30:52 2012 -0400

No need to trim capacity any more; it's allocated to the exact size.

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 4c93501..928e511 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -756,12 +756,6 @@ public:
 void ScDPCache::PostInit()
 {
 maEmptyRows.build_tree();
-FieldsType::iterator it = maFields.begin(), itEnd = maFields.end();
-for (; it != itEnd; ++it)
-{
-// Trim excess capacity.
-ItemsType(it->maItems).swap(it->maItems);
-}
 }
 
 void ScDPCache::Clear()
commit 9e19cf80c080929c914dc0bfa069f22c8526c3b0
Author: Kohei Yoshida 
Date:   Thu Mar 15 20:23:10 2012 -0400

We don't need these extra order index array; items are already sorted.

This shaves off extra 5MB of memory with my test document.

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 6566979..1e26688 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -80,7 +80,10 @@ public:
  */
 boost::scoped_ptr mpGroup;
 
-ItemsType maItems; /// Unique values in the field.
+/**
+ * Unique values in the field, stored in ascending order.
+ */
+ItemsType maItems;
 
 /**
  * Original source data represented as indices to the unique value
@@ -89,17 +92,6 @@ public:
  */
 IndexArrayType maData;
 
-/**
- * Ascending order of field items.
- */
-IndexArrayType maGlobalOrder;
-
-/**
- * Ranks of each unique data represented by their index.  It's a
- * reverse mapping of item index to global order index.
- */
-mutable IndexArrayType maIndexOrder;
-
 sal_uLong mnNumFormat;
 
 Field();
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 08b0d25..4c93501 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -376,12 +376,6 @@ void processBuckets(std::vector& aBuckets, 
ScDPCache::Field& rField)
 size_t nLen = distance(itBeg, itUniqueEnd);
 rField.maItems.reserve(nLen);
 std::for_each(itBeg, itUniqueEnd, PushBackValue(rField.maItems));
-
-// The items are actually already sorted.  So, just insert a sequence
-// of integers from 0 and up.
-rField.maGlobalOrder.reserve(nLen);
-for (size_t i = 0; i < nLen; ++i)
-rField.maGlobalOrder.push_back(i);
 }
 
 }
@@ -1120,24 +1114,9 @@ void ScDPCache::ClearGroupFields()
 std::for_each(maFields.begin(), maFields.end(), ClearGroupItems());
 }
 
-SCROW ScDPCache::GetOrder(long nDim, SCROW nIndex) const
+SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex) const
 {
-OSL_ENSURE( nDim >=0 && nDim < mnColumnCount, 
"ScDPTableDataCache::GetOrder : out of bound" );
-
-const Field& rField = maFields[nDim];
-if (rField.maIndexOrder.size() !=  rField.maGlobalOrder.size())
-{ //not inited
-SCROW nRow  = 0;
-rField.maIndexOrder.resize(rField.maGlobalOrder.size(), 0);
-for (size_t i = 0, n = rField.maGlobalOrder.size(); i < n; ++i)
-{
-nRow = rField.maGlobalOrder[i];
-rField.maIndexOrder[nRow] = i;
-}
-}
-
-OSL_ENSURE(nIndex >= 0 && sal::static_int_cast(nIndex) < 
rField.maIndexOrder.size() , "ScDPTableDataCache::GetOrder");
-return rField.maIndexOrder[nIndex];
+return nIndex;
 }
 
 ScDocument* ScDPCache::GetDoc() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: nss/makefile.mk nss/nss-string-concat.patch

2012-03-15 Thread Lubos Lunak 
 nss/makefile.mk |2 +-
 nss/nss-string-concat.patch |   11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit dbf3b4ab772a398ba397ea763deb6003adaf0586
Author: Luboš Luňák 
Date:   Fri Mar 16 02:00:23 2012 +0100

"foo"bar -> "foo" bar

diff --git a/nss/makefile.mk b/nss/makefile.mk
index c75684a..4323887 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -48,7 +48,7 @@ VER_PATCH=8
 TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.8.6
 TARFILE_MD5=71474203939fafbe271e1263e61d083e
 TARFILE_ROOTDIR=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
-PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch 
nss-clang_os_Linux_x86_s_comments.patch
+PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch 
nss-clang_os_Linux_x86_s_comments.patch nss-string-concat.patch
 
 .IF "$(OS)"=="MACOSX"
 PATCH_FILES+=nss_macosx.patch
diff --git a/nss/nss-string-concat.patch b/nss/nss-string-concat.patch
new file mode 100644
index 000..68f9c4b
--- /dev/null
+++ b/nss/nss-string-concat.patch
@@ -0,0 +1,11 @@
+--- misc/build/nss-3.12.8/mozilla/security/nss/lib/softoken/secmodt.h.sav  
2008-12-17 22:39:05.0 +0100
 misc/build/nss-3.12.8/mozilla/security/nss/lib/softoken/secmodt.h  
2012-03-16 01:56:47.881621915 +0100
+@@ -338,7 +338,7 @@ typedef PRUint32 PK11AttrFlags;
+ #define SECMOD_SLOT_FLAGS 
"slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
+ 
+ #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \
+-"Flags=internal,critical"fips" slotparams=("#slot"={"SECMOD_SLOT_FLAGS"})"
++"Flags=internal,critical" fips " slotparams=(" #slot "={" SECMOD_SLOT_FLAGS 
"})"
+ 
+ #define SECMOD_INT_NAME "NSS Internal PKCS #11 Module"
+ #define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk deskt

2012-03-15 Thread Matus Kukan 
 desktop/Executable_sbase.mk|7 +--
 desktop/Executable_scalc.mk|7 +--
 desktop/Executable_sdraw.mk|7 +--
 desktop/Executable_simpress.mk |7 +--
 desktop/Executable_smath.mk|7 +--
 desktop/Executable_sweb.mk |7 +--
 desktop/Executable_swriter.mk  |7 +--
 7 files changed, 35 insertions(+), 14 deletions(-)

New commits:
commit 45504f9ba8de2a4372193910b2cb9405f1ea896a
Author: Matúš Kukan 
Date:   Fri Mar 16 01:16:34 2012 +0100

fix windows build

No idea if this is proper fix or it needs to be done otherwise.

diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index f3caf5b..098f8c2 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,sbase,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,sbase,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,sbase) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,sbase,\
 desktop/win32/source/applauncher/sbase \
 ))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 3c9990b..290e880 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,scalc,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,scalc,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,scalc) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,scalc,\
 desktop/win32/source/applauncher/scalc \
 ))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index dcea97d..2e57495 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,sdraw,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,sdraw,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,sdraw) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,sdraw,\
 desktop/win32/source/applauncher/sdraw \
 ))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index ab0cbc0..926ad57 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,simpress,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,simpress,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,simpress) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,simpress,\
 desktop/win32/source/applauncher/simpress \
 ))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index fe1607b..ed1b460 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,smath,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,smath,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,smath) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,smath,\
 desktop/win32/source/applauncher/smath \
 ))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index a8810b1..858bc7a 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -37,10 +37,13 @@ $(eval $(call gb_Executable_add_linked_libs,sweb,\
 $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,sweb,\
-winlauncher \
+$(eval $(call gb_Executable_add_libs,sweb,\
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \
 ))
 
+$(call gb_Executable_get_target,sweb) : \
+$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
+
 $(eval $(call gb_Executable_add_noexception_objects,sweb,\
 desktop/win32/source/applauncher/sweb \
 ))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index

[Libreoffice-commits] .: sc/source

2012-03-15 Thread Andras Timar 
 sc/source/ui/view/prevwsh.cxx  |7 ++-
 sc/source/ui/view/printfun.cxx |7 ++-
 sc/source/ui/view/tabvwsh4.cxx |8 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 010560f553ee361ccda4bd14f1ee6b3f18250847
Author: Szabolcs Dezsi 
Date:   Thu Mar 15 15:23:17 2012 +0100

i#84393 Fix title field in header, footer

According to help Title should be the Title property of the document,
not the file name without extension. If that property is missing, we
fall back to file name without extension.

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ccb10ee..85dd306 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -77,6 +77,7 @@
 
 #include 
 #include 
+#include 
 
 #include "sc.hrc"
 #include "scabstdlg.hxx"
@@ -844,7 +845,11 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& 
rData )
 pDoc->GetName(nTab, aTmp);
 rData.aTabName = aTmp;
 
-rData.aTitle= pDocShell->GetTitle();
+if( pDocShell->getDocProperties()->getTitle().getLength() != 0 )
+rData.aTitle = pDocShell->getDocProperties()->getTitle();
+else
+rData.aTitle = pDocShell->GetTitle();
+
 const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
 rData.aLongDocName  = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( rData.aLongDocName.Len() )
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 01f1b5b..9d82ba5 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -83,6 +83,7 @@
 #include 
 
 #include 
+#include 
 
 #define ZOOM_MIN10
 
@@ -1037,7 +1038,11 @@ void ScPrintFunc::InitParam( const ScPrintOptions* 
pOptions )
 
 SetDateTime( Date( Date::SYSTEM ), Time( Time::SYSTEM ) );
 
-aFieldData.aTitle   = pDocShell->GetTitle();
+if( pDocShell->getDocProperties()->getTitle().getLength() != 0 )
+aFieldData.aTitle = pDocShell->getDocProperties()->getTitle();
+else
+aFieldData.aTitle = pDocShell->GetTitle();
+
 const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
 aFieldData.aLongDocName = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( aFieldData.aLongDocName.Len() )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index cf93d15..35c2c54 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -97,6 +97,8 @@
 #include "markdata.hxx"
 #include "preview.hxx"
 
+#include 
+
 void ActivateOlk( ScViewData* pViewData );
 void DeActivateOlk( ScViewData* pViewData );
 
@@ -1824,7 +1826,11 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& 
rData )
 pDoc->GetName(nTab, aTmp);
 rData.aTabName = aTmp;
 
-rData.aTitle= pDocShell->GetTitle();
+if( pDocShell->getDocProperties()->getTitle().getLength() != 0 )
+rData.aTitle = pDocShell->getDocProperties()->getTitle();
+else
+rData.aTitle = pDocShell->GetTitle();
+
 const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
 rData.aLongDocName  = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( rData.aLongDocName.Len() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Markus Mohrhard 
 sc/source/core/data/cell.cxx  |6 +++---
 sc/source/ui/inc/namepast.hxx |1 +
 sc/source/ui/namedlg/namepast.cxx |5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2118ec3630fe12ff2a663c94421780870f264e83
Author: Markus Mohrhard 
Date:   Thu Mar 15 22:22:10 2012 +0100

update the relatice refs after the absolute refs, fdo#47285

The algoithm for updating absolute refs needs to calculate the old
position based on the information before any updates to the RefData

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 6d5baaf..f191c5d 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -788,9 +788,6 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, 
ScDocument& rDoc, cons
 {
 pCode = rCell.pCode->Clone();
 
-if ( nCloneFlags & SC_CLONECELL_ADJUST3DREL )
-pCode->ReadjustRelative3DReferences( rCell.aPos, aPos );
-
 // evtl. Fehler zuruecksetzen und neu kompilieren
 //  nicht im Clipboard - da muss das Fehlerflag erhalten bleiben
 //  Spezialfall Laenge=0: als Fehlerzelle erzeugt, dann auch Fehler 
behalten
@@ -827,6 +824,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, 
ScDocument& rDoc, cons
 pCode->AdjustAbsoluteRefs( rCell.pDocument, rCell.aPos, aPos );
 }
 
+if ( nCloneFlags & SC_CLONECELL_ADJUST3DREL )
+pCode->ReadjustRelative3DReferences( rCell.aPos, aPos );
+
 if( !bCompile )
 {   // Name references with references and ColRowNames
 pCode->Reset();
commit bd43abc94d30332d06fad7964bd01dc5f70c22e7
Author: Markus Mohrhard 
Date:   Thu Mar 15 15:57:54 2012 +0100

ScNameMgrTable takes a reference, fdo#47307

diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index b2abb45..77e3712 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -57,6 +57,7 @@ private:
 ScRangeManagerTable* mpTable;
 
 std::vector maSelectedNames;
+boost::ptr_map maRangeMap;
 public:
 ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList=true );
 
diff --git a/sc/source/ui/namedlg/namepast.cxx 
b/sc/source/ui/namedlg/namepast.cxx
index 68a406f..8b4f78b 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -54,18 +54,17 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, 
ScDocShell* pShell, bool )
 {
 ScDocument* pDoc = pShell->GetDocument();
 std::map aCopyMap;
-boost::ptr_map aRangeMap;
 pDoc->GetRangeNameMap(aCopyMap);
 std::map::iterator itr = aCopyMap.begin(), 
itrEnd = aCopyMap.end();
 for (; itr != itrEnd; ++itr)
 {
 rtl::OUString aTemp(itr->first);
-aRangeMap.insert(aTemp, new ScRangeName(*itr->second));
+maRangeMap.insert(aTemp, new ScRangeName(*itr->second));
 }
 
 ScViewData* pViewData = pShell->GetViewData();
 ScAddress aPos(pViewData->GetCurX(), pViewData->GetCurY(), 
pViewData->GetTabNo());
-mpTable = new ScRangeManagerTable(&maCtrl, aRangeMap, aPos);
+mpTable = new ScRangeManagerTable(&maCtrl, maRangeMap, aPos);
 
 maBtnPaste.SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl) );
 maBtnPasteAll.SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-03-15 Thread Noel Power 
 sc/source/ui/app/inputhdl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3b1592165d0513e90e28dfee92bc9db032fa221
Author: Noel Power 
Date:   Thu Mar 15 20:10:12 2012 +

fix to update inputbar when setting a range for a formula fdo#46809

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 29a40c5..7232ad3 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1811,7 +1811,7 @@ void ScInputHandler::UpdateActiveView()
 else
 pTableView = NULL;
 
-if (pInputWin && pInputWin->IsInputActive())
+if (pInputWin && eMode == SC_INPUT_TOP )
 pTopView = pInputWin->GetEditView();
 else
 pTopView = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

2012-03-15 Thread Noel Power 
 oox/source/ole/vbamodule.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1bd695d3ddcbce48899a70130b5e948c48541d17
Author: Noel Power 
Date:   Thu Mar 15 19:50:11 2012 +

fix mishandling of 'End Sub' is there is a trailing comment fod#46889

diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 9f0e5ff..d5c1db3 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -313,7 +313,7 @@ OUString VbaModule::readSourceCode( StorageBase& rVbaStrg, 
const Reference< XNam
 procInfo.nPos = aSourceCode.getLength();
 }
 }
-else if ( mbExecutable && aCodeLine.trim().equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM("End Sub")) )
+else if ( mbExecutable && aCodeLine.trim().matchAsciiL( 
RTL_CONSTASCII_STRINGPARAM("End Sub")) )
 {
 // un-matched End Sub
 if ( !procInfo.bInProcedure )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Kohei Yoshida 
 sc/inc/dpcache.hxx |9 
 sc/inc/dpitemdata.hxx  |2 
 sc/source/core/data/dpcache.cxx|  401 +
 sc/source/core/data/dpdimsave.cxx  |   12 -
 sc/source/core/data/dpitemdata.cxx |   11 +
 5 files changed, 254 insertions(+), 181 deletions(-)

New commits:
commit 20d55ad66f0f94c9f6a583b5406a39717c1c6d46
Author: Kohei Yoshida 
Date:   Thu Mar 15 15:39:51 2012 -0400

Consolidated file-local functions.

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 140885e..08b0d25 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -62,89 +62,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
 
-namespace {
-
-void getItemValue(
-ScDPItemData& rData, const Reference& xRow, sal_Int32 nType,
-long nCol, const Date& rNullDate, short& rNumType)
-{
-rNumType = NUMBERFORMAT_NUMBER;
-try
-{
-double fValue = 0.0;
-switch (nType)
-{
-case sdbc::DataType::BIT:
-case sdbc::DataType::BOOLEAN:
-{
-rNumType = NUMBERFORMAT_LOGICAL;
-fValue  = xRow->getBoolean(nCol) ? 1 : 0;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::TINYINT:
-case sdbc::DataType::SMALLINT:
-case sdbc::DataType::INTEGER:
-case sdbc::DataType::BIGINT:
-case sdbc::DataType::FLOAT:
-case sdbc::DataType::REAL:
-case sdbc::DataType::DOUBLE:
-case sdbc::DataType::NUMERIC:
-case sdbc::DataType::DECIMAL:
-{
-//! do the conversion here?
-fValue = xRow->getDouble(nCol);
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::DATE:
-{
-rNumType = NUMBERFORMAT_DATE;
-
-util::Date aDate = xRow->getDate(nCol);
-fValue = Date(aDate.Day, aDate.Month, aDate.Year) - rNullDate;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::TIME:
-{
-rNumType = NUMBERFORMAT_TIME;
-
-util::Time aTime = xRow->getTime(nCol);
-fValue = ( aTime.Hours * 3600 + aTime.Minutes * 60 +
-   aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / 
D_TIMEFACTOR;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::TIMESTAMP:
-{
-rNumType = NUMBERFORMAT_DATETIME;
-
-util::DateTime aStamp = xRow->getTimestamp(nCol);
-fValue = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - 
rNullDate ) +
- ( aStamp.Hours * 3600 + aStamp.Minutes * 60 +
-   aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) 
/ D_TIMEFACTOR;
-rData.SetValue(fValue);
-break;
-}
-case sdbc::DataType::CHAR:
-case sdbc::DataType::VARCHAR:
-case sdbc::DataType::LONGVARCHAR:
-case sdbc::DataType::SQLNULL:
-case sdbc::DataType::BINARY:
-case sdbc::DataType::VARBINARY:
-case sdbc::DataType::LONGVARBINARY:
-default:
-rData.SetString(xRow->getString(nCol));
-}
-}
-catch (uno::Exception&)
-{
-}
-}
-
-}
-
 ScDPCache::GroupItems::GroupItems() {}
 
 ScDPCache::GroupItems::GroupItems(const ScDPNumGroupInfo& rInfo) :
@@ -282,6 +199,85 @@ void initFromCell(ScDocument* pDoc, SCCOL nCol, SCROW 
nRow, SCTAB nTab, ScDPItem
 }
 }
 
+void getItemValue(
+ScDPItemData& rData, const Reference& xRow, sal_Int32 nType,
+long nCol, const Date& rNullDate, short& rNumType)
+{
+rNumType = NUMBERFORMAT_NUMBER;
+try
+{
+double fValue = 0.0;
+switch (nType)
+{
+case sdbc::DataType::BIT:
+case sdbc::DataType::BOOLEAN:
+{
+rNumType = NUMBERFORMAT_LOGICAL;
+fValue  = xRow->getBoolean(nCol) ? 1 : 0;
+rData.SetValue(fValue);
+break;
+}
+case sdbc::DataType::TINYINT:
+case sdbc::DataType::SMALLINT:
+case sdbc::DataType::INTEGER:
+case sdbc::DataType::BIGINT:
+case sdbc::DataType::FLOAT:
+case sdbc::DataType::REAL:
+case sdbc::DataType::DOUBLE:
+case sdbc::DataType::NUMERIC:
+case sdbc::DataType::DECIMAL:
+{
+//! do the conversion here?
+fValue = xRow->getDouble(nCol);
+rData.SetValue(fValue);
+break;
+}
+

[Libreoffice-commits] .: dbaccess/source

2012-03-15 Thread Lionel Elie Mamane 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 08ba87c55858335094c24ca4e610a13da10c
Author: Lionel Elie Mamane 
Date:   Thu Mar 15 18:54:17 2012 +0100

fixup: use introduced preprocessor constant instead of hardcoded constant

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 267c7a9..12b5b29 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2319,9 +2319,9 @@ namespace
 const ::connectivity::OSQLParseNode* pParseRoot )
 {
 SqlParseError eErrorCode = eOk;
-if (!pParseRoot->getChild(3)->getChild(5)->isLeaf())
+if (!pParseRoot->getChild(3)->getChild(ORDER_BY_CHILD_POS)->isLeaf())
 {
-::connectivity::OSQLParseNode* pNode = 
pParseRoot->getChild(3)->getChild(5)->getChild(2);
+::connectivity::OSQLParseNode* pNode = 
pParseRoot->getChild(3)->getChild(ORDER_BY_CHILD_POS)->getChild(2);
 ::connectivity::OSQLParseNode* pParamRef = NULL;
 
 OQueryController& rController = 
static_cast(_pView->getController());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

2012-03-15 Thread Lionel Elie Mamane 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80c235510aeb19d4df6a07be7499e70122313bbf
Author: Lionel Elie Mamane 
Date:   Thu Mar 15 11:22:32 2012 +0100

fdo#46843 look for order by clause as fifth child of select_statement

Since commit 33b9b857ea6cb5a6f731de68f58e532242c43d30 (dba34c: #i20306# 
support for window function and limit fetch first, ... added), order by is the 
fifth child. It was the fourth one before.

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 397cedb..267c7a9 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2319,9 +2319,9 @@ namespace
 const ::connectivity::OSQLParseNode* pParseRoot )
 {
 SqlParseError eErrorCode = eOk;
-if (!pParseRoot->getChild(3)->getChild(4)->isLeaf())
+if (!pParseRoot->getChild(3)->getChild(5)->isLeaf())
 {
-::connectivity::OSQLParseNode* pNode = 
pParseRoot->getChild(3)->getChild(4)->getChild(2);
+::connectivity::OSQLParseNode* pNode = 
pParseRoot->getChild(3)->getChild(5)->getChild(2);
 ::connectivity::OSQLParseNode* pParamRef = NULL;
 
 OQueryController& rController = 
static_cast(_pView->getController());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Caolán McNamara 
 binfilter/bf_sw/source/filter/inc/wrt_fn.hxx   |5 
 binfilter/bf_sw/source/filter/writer/sw_writer.cxx |  128 -
 binfilter/bf_sw/source/filter/writer/sw_wrt_fn.cxx |   61 --
 binfilter/inc/bf_sw/shellio.hxx|   28 
 4 files changed, 222 deletions(-)

New commits:
commit 49d3d392b740bd90bacf73036b6dae454d8fa5c8
Author: Caolán McNamara 
Date:   Thu Mar 15 16:25:46 2012 +

callcatcher: now safely remove the actually unused parts

diff --git a/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx 
b/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx
index f0fd707..58aef01 100644
--- a/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx
+++ b/binfilter/bf_sw/source/filter/inc/wrt_fn.hxx
@@ -46,11 +46,6 @@ class Writer;
 typedef Writer& (*FnAttrOut)( Writer&, const SfxPoolItem& );
 typedef FnAttrOut SwAttrFnTab[ POOLATTR_END - POOLATTR_BEGIN ];
 
-Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& );
-Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&,
- BOOL bDeep, BOOL bTstForDefault = TRUE );
-
-
 /* Funktionspointer auf die Node-Write-Funktionen */
 
 enum RES_NODE
diff --git a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx 
b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
index 0dcc3be..53069ed 100644
--- a/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
+++ b/binfilter/bf_sw/source/filter/writer/sw_writer.cxx
@@ -53,10 +53,6 @@
 #include 
 namespace binfilter {
 
-// Stringbuffer fuer die umgewandelten Zahlen
-static sal_Char aNToABuf[] = "0";
-#define NTOABUFLEN (sizeof(aNToABuf))
-
 /*N*/ DECLARE_TABLE( SwBookmarkNodeTable, SvPtrarr* )
 
 /*N*/ struct Writer_Impl
@@ -166,28 +162,6 @@ static sal_Char aNToABuf[] = "0";
 /*?*/   return TRUE;
 /*N*/ }
 
-// suche die naechste Bookmark-Position aus der Bookmark-Tabelle
-
- SwPaM* Writer::NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx ) const
- {
-SwNodes* pNds = &rDoc.GetNodes();
-
-SwNodeIndex aStt( *pNds, nStartIdx );
-SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
-if( !pCNode && 0 == ( pCNode = pNds->GoNext( &aStt )) )
-OSL_ENSURE( !this, "An StartPos kein ContentNode mehr" );
-
-SwPaM* pNew = new SwPaM( aStt );
-pNew->SetMark();
-aStt = nEndIdx;
-if( 0 == (pCNode = aStt.GetNode().GetCntntNode()) &&
-0 == (pCNode = pNds->GoPrevious( &aStt )) )
-OSL_ENSURE( !this, "An StartPos kein ContentNode mehr" );
-pCNode->MakeEndIndex( &pNew->GetPoint()->nContent );
-pNew->GetPoint()->nNode = aStt;
-return pNew;
- }
-
 // Stream-spezifisches
 /*N*/ #ifdef DBG_UTIL
 /*N*/ SvStream& Writer::Strm()
@@ -198,53 +172,6 @@ static sal_Char aNToABuf[] = "0";
 /*N*/ #endif
 
 
-SvStream& Writer::OutHex( SvStream& rStrm, ULONG nHex, BYTE nLen )
-{  // in einen Stream aus
-// Pointer an das Bufferende setzen
-sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
-for( BYTE n = 0; n < nLen; ++n )
-{
-*(--pStr) = (sal_Char)(nHex & 0xf ) + 48;
-if( *pStr > '9' )
-*pStr += 39;
-nHex >>= 4;
-}
-return rStrm << pStr;
-}
-
-SvStream& Writer::OutLong( SvStream& rStrm, long nVal )
-{
-// Pointer an das Bufferende setzen
-sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
-
-int bNeg = nVal < 0;
-if( bNeg )
-nVal = -nVal;
-
-do {
-*(--pStr) = (sal_Char)(nVal % 10 ) + 48;
-nVal /= 10;
-} while( nVal );
-
-// Ist Zahl negativ, dann noch -
-if( bNeg )
-*(--pStr) = '-';
-
-return rStrm << pStr;
-}
-
-SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
-{
-// Pointer an das Bufferende setzen
-sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
-
-do {
-*(--pStr) = (sal_Char)(nVal % 10 ) + 48;
-nVal /= 10;
-} while ( nVal );
-return rStrm << pStr;
-}
-
 /*N*/ ULONG Writer::Write( SwPaM& rPaM, SvStream& rStrm )
 /*N*/ {
 /*N*/  pStrm = &rStrm;
@@ -263,61 +190,6 @@ SvStream& Writer::OutULong( SvStream& rStrm, ULONG nVal )
 /*N*/  return nRet;
 /*N*/ }
 
-/*N*/ void Writer::PutNumFmtFontsInAttrPool()
-/*N*/ {
-/*N*/   if( !pImpl )
-/*?*/   pImpl = new Writer_Impl;
-/*N*/
-/*N*/   // dann gibt es noch in den NumRules ein paar Fonts
-/*N*/   // Diese in den Pool putten. Haben sie danach einen RefCount > 1
-/*N*/   // kann es wieder entfernt werden - ist schon im Pool
-/*N*/   SfxItemPool& rPool = pDoc->GetAttrPool();
-/*N*/   const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
-/*N*/   const SwNumRule* pRule;
-/*N*/   const SwNumFmt* pFmt;
-/*N*/   const Font *pFont, *pDefFont = &SwNumRule::GetDefBulletFont();
-/*N*/   BOOL bCheck = FALSE;
-/*N*/
-/*N*/   for( USHORT nGet = rListTbl.Count(); nGet; )
-/*N*/   if( pDoc->IsUsed( *(pRule = rListTbl[ --nGet ] )))
-/*?*/   for( BYTE nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
-/*?*/

[Libreoffice-commits] .: dtrans/source

2012-03-15 Thread Caolán McNamara 
 dtrans/source/win32/misc/ImplHelper.cxx |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 66d532fca4cf9504a53bbe0c8a584d1144fc8e0f
Author: Caolán McNamara 
Date:   Thu Mar 15 13:28:18 2012 +

can't use auto_ptr with an array, wrong delete vs new[]

diff --git a/dtrans/source/win32/misc/ImplHelper.cxx 
b/dtrans/source/win32/misc/ImplHelper.cxx
index 5243aac..04c850e 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -46,6 +46,8 @@
 #include 
 #endif
 
+#include 
+
 //
 // defines
 //
@@ -133,15 +135,12 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE 
lctype )
 
 OSL_ASSERT( len > 0 );
 
-std::auto_ptr< sal_Unicode > lpwchBuff( new sal_Unicode[len] );
+std::vector< sal_Unicode > lpwchBuff(len);
 
-if ( NULL != lpwchBuff.get( ) )
-{
-len = MultiByteToWideChar(
-CP_ACP, 0, buff, -1, reinterpret_cast(lpwchBuff.get( 
)), len );
+len = MultiByteToWideChar(
+CP_ACP, 0, buff, -1, reinterpret_cast(&lpwchBuff[0]), len 
);
 
-winCP = OUString( lpwchBuff.get( ), (len - 1) );
-}
+winCP = OUString( &lpwchBuff[0], (len - 1) );
 }
 
 return winCP;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-03-15 Thread Ivan Timofeev 
 sc/source/filter/html/htmlpars.cxx |3 ++-
 sc/source/filter/inc/eeparser.hxx  |8 +---
 sc/source/filter/rtf/eeimpars.cxx  |   28 
 3 files changed, 23 insertions(+), 16 deletions(-)

New commits:
commit 96328945afe8f920df41741931163ba56b7b2820
Author: Noel Grandin 
Date:   Wed Mar 14 14:00:35 2012 +0200

Convert tools/table.hxx to std::map in ScEEParser class in SC module

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index 323e1a2..b9f9fb8 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "htmlpars.hxx"
 #include "global.hxx"
@@ -331,7 +332,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, 
const String& rBaseURL )
 {
 aSize.Width() = *pOff - nOff;
 aSize = pDefaultDev->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
-pColWidths->Insert( j-1, (void*)aSize.Width() );
+maColWidths[ j-1 ] = aSize.Width();
 nOff = *pOff;
 }
 return nErr;
diff --git a/sc/source/filter/inc/eeparser.hxx 
b/sc/source/filter/inc/eeparser.hxx
index dc1daf1..9c272d0 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -108,6 +107,8 @@ struct ScEEParseEntry
 
 class EditEngine;
 
+typedef std::map ColWidthsMap;
+
 class ScEEParser
 {
 protected:
@@ -116,7 +117,7 @@ protected:
 SfxItemPool*pDocPool;
 ::std::vector< ScEEParseEntry* > maList;
 ScEEParseEntry* pActEntry;
-Table*  pColWidths;
+ColWidthsMapmaColWidths;
 int nLastToken;
 SCCOL   nColCnt;
 SCROW   nRowCnt;
@@ -131,7 +132,8 @@ public:
 
 virtual sal_uLong   Read( SvStream&, const String& rBaseURL ) = 0;
 
-Table*  GetColWidths() const { return pColWidths; }
+const ColWidthsMap& GetColWidths() const { return maColWidths; }
+ColWidthsMap&   GetColWidths() { return maColWidths; }
 voidGetDimensions( SCCOL& nCols, SCROW& nRows ) const
 { nCols = nColMax; nRows = nRowMax; }
 
diff --git a/sc/source/filter/rtf/eeimpars.cxx 
b/sc/source/filter/rtf/eeimpars.cxx
index 2fb0484..d34e135 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "eeimport.hxx"
 #include "global.hxx"
@@ -431,14 +432,17 @@ void ScEEImport::WriteToDocument( sal_Bool bSizeColsRows, 
double nOutputFactor,
 if ( bSizeColsRows )
 {
 // Spaltenbreiten
-Table* pColWidths = mpParser->GetColWidths();
-if ( pColWidths->Count() )
+ColWidthsMap& rColWidths = mpParser->GetColWidths();
+if ( !rColWidths.empty() )
 {
 nProgress = 0;
 pProgress->SetState( nProgress, nEndCol - nStartCol + 1 );
 for ( SCCOL nCol = nStartCol; nCol <= nEndCol; nCol++ )
 {
-sal_uInt16 nWidth = (sal_uInt16)(sal_uLong) pColWidths->Get( 
nCol );
+sal_uInt16 nWidth = 0;
+ColWidthsMap::const_iterator it = rColWidths.find( nCol );
+if ( it != rColWidths.end() )
+nWidth = it->second;
 if ( nWidth )
 mpDoc->SetColWidth( nCol, nTab, nWidth );
 pProgress->SetState( ++nProgress );
@@ -513,20 +517,22 @@ sal_Bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, 
SCTAB /*nTab*/, ScEEPa
 nDir = pI->nDir;
 }
 // Spaltenbreiten
-Table* pColWidths = mpParser->GetColWidths();
-long nThisWidth = (long) pColWidths->Get( nCol );
+ColWidthsMap& rColWidths = mpParser->GetColWidths();
+long nThisWidth = 0;
+ColWidthsMap::const_iterator it = rColWidths.find( nCol );
+if ( it != rColWidths.end() )
+nThisWidth = it->second;
 long nColWidths = nThisWidth;
 SCCOL nColSpanCol = nCol + pE->nColOverlap;
 for ( SCCOL nC = nCol + 1; nC < nColSpanCol; nC++ )
 {
-nColWidths += (long) pColWidths->Get( nC );
+ColWidthsMap::const_iterator it2 = rColWidths.find( nC   );
+if ( it2 != rColWidths.end() )
+nColWidths += it2->second;
 }
 if ( nWidth > nColWidths )
 {   // Differenz nur in der ersten Spalte eintragen
-if ( nThisWidth )
-pColWidths->Replace( nCol, (void*)(nWidth - nColWidths + 
nThisWidth) );
-else
-pColWidths->Insert( nCol, (void*)(nWidth - nColWidths) );
+rColWidths[ nCol ] = nWidth - nColWidths + nThisWidth;
 }
 // Zeilenhoehen, Differenz auf alle betroffenen Zeilen verteilen
 SCROW nRowSpan = pE->nRowOverlap;
@@ -619,7 +625,6 @@ ScEEParser::ScEEParser( EditEngine* pEditP ) :

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

2012-03-15 Thread Stephan Bergmann 
 configmgr/source/components.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 90e2949099586e98619561dc781cc4deb8fc1ef0
Author: Stephan Bergmann 
Date:   Thu Mar 15 16:38:40 2012 +0100

Adapt prev 4f78696117ebe4f729880b5d9bfc2f5817b73543 to 3.5 rtl::OUString

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index a341d84..80741ae 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -845,7 +845,8 @@ void Components::parseXcsXcuIniLayer(
 rtl::Bootstrap ini(url);
 if (ini.getHandle() != 0)
 {
-rtl::OUStringBuffer prefix("${.override:");
+rtl::OUStringBuffer prefix;
+prefix.appendAscii(RTL_CONSTASCII_STRINGPARAM("${.override:"));
 for (sal_Int32 i = 0; i != url.getLength(); ++i) {
 sal_Unicode c = url[i];
 switch (c) {
@@ -859,13 +860,16 @@ void Components::parseXcsXcuIniLayer(
 }
 }
 prefix.append(':');
-rtl::OUString urls(prefix.toString() + rtl::OUString("SCHEMA}"));
+rtl::OUString urls(
+prefix.toString()
++ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SCHEMA}")));
 rtl::Bootstrap::expandMacros(urls);
 if (!urls.isEmpty())
 {
 parseFileList(layer, &parseXcsFile, urls, ini, false);
 }
-urls = prefix.makeStringAndClear() + rtl::OUString("DATA}");
+urls = prefix.makeStringAndClear()
++ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA}"));
 rtl::Bootstrap::expandMacros(urls);
 if (!urls.isEmpty())
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in sw/Module_sw.mk

2012-03-15 Thread Lubos Lunak 
 configure.in|6 --
 sw/Module_sw.mk |4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit b1c472c7021ebb85afdc5c4afd0e0fcd74ab15d9
Author: Luboš Luňák 
Date:   Thu Mar 15 16:04:12 2012 +0100

do not leave temporary files after a configure check

diff --git a/configure.in b/configure.in
index f71014d..72b45b9 100644
--- a/configure.in
+++ b/configure.in
@@ -4495,13 +4495,15 @@ struct S2: S1 { virtual ~S2(); };
 struct S3: S2 { virtual ~S3(); }; S3::~S3() {}
 _ACEOF
 gccvisinlineshiddenok=yes
-if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC 
-fvisibility-inlines-hidden conftestlib1.cc -o lib1.so >/dev/null 2>/dev/null; 
then
+if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC 
-fvisibility-inlines-hidden conftestlib1.cc -o libconftest1.so >/dev/null 
2>/dev/null; then
 gccvisinlineshiddenok=no
 else
-if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC 
-fvisibility-inlines-hidden conftestlib2.cc -L. -l1 -Wl,-z,defs -o lib2.so 
>/dev/null 2>/dev/null; then
+if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC 
-fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 -Wl,-z,defs -o 
libconftest2.so >/dev/null 2>/dev/null; then
 gccvisinlineshiddenok=no
 fi
 fi
+
+rm -f libconftest1.so libconftest2.so
 
 AC_MSG_RESULT([$gccvisinlineshiddenok])
 if test "$gccvisinlineshiddenok" = "no"; then
commit 2db82ffc1bdd5865e51932930bb5c4688e2de8a3
Author: Luboš Luňák 
Date:   Thu Mar 15 16:00:02 2012 +0100

these writer unittests surely are slow

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 6ecc588..8cf4f39 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -48,12 +48,12 @@ $(eval $(call gb_Module_add_targets,sw,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sw,\
-CppunitTest_sw_filters_test \
-CppunitTest_sw_macros_test \
 CppunitTest_sw_swdoc_test \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
+CppunitTest_sw_filters_test \
+CppunitTest_sw_macros_test \
 CppunitTest_sw_subsequent_rtftok \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'update' - check.php

2012-03-15 Thread Jan Holesovsky 
 check.php |   19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

New commits:
commit bd668c3fff2668667d29e063cc1da50d39f981a0
Author: Jan Holesovsky 
Date:   Thu Mar 15 14:28:49 2012 +0100

3.5.1 RC2 is Final, update everything earlier to that.

diff --git a/check.php b/check.php
index 3622bf8..a5157a3 100644
--- a/check.php
+++ b/check.php
@@ -101,13 +101,12 @@ $update_versions = array(
 'e40af8c-10029e3-615e522-88673a2-727f724' => 'LO-3.5',  # 3.5.0 Beta3
 'b6c8ba5-8c0b455-0b5e650-d7f0dd3-b100c87' => 'LO-3.5',  # 3.5.0 RC1
 'e371a95-bf68a13-5a1aa2b-d3c1ae9-b938258' => 'LO-3.5',  # 3.5.0 RC2
-# To be uncommented when 3.5.1 Final is out
-#'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' => 'LO-3.5',  # 3.5.0 RC3 / 
Final
+'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' => 'LO-3.5',  # 3.5.0 RC3 / Final
 
 # 3.5.1 versions
-'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' => 'LO-3.5-pre',  # 3.5.1 RC1
+'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' => 'LO-3.5',  # 3.5.1 RC1
 # To be uncommented when 3.5.2 Final is out
-#'dc9775d-05ecbee-0851ad3-1586698-727bf66' => 'LO-3.5',  # 3.5.1 RC2
+#'dc9775d-05ecbee-0851ad3-1586698-727bf66' => 'LO-3.5',  # 3.5.1 RC2 / 
Final
 );
 
 # Descriptions of the target versions
@@ -115,17 +114,11 @@ $update_versions = array(
 # 'gitid' is the content of program/versionrc:buildid of the newest version
 # 'id' is what is going to be shown in the update information dialog
 $update_map = array(
-'LO-3.5' => array('gitid'   => 
'7e68ba2-a744ebf-1f241b7-c506db1-7d53735',
-  'id'  => 'LibreOffice 3.5.0',
-  'version' => '3.5.0',
+'LO-3.5' => array('gitid'   => 
'dc9775d-05ecbee-0851ad3-1586698-727bf66',
+  'id'  => 'LibreOffice 3.5.1',
+  'version' => '3.5.1',
   'update_type' => 'text/html',
   'update_src'  => 'http://www.libreoffice.org/download/'),
-# To be deleted when 3.5.1 is Final
-'LO-3.5-pre' => array('gitid'   => 
'dc9775d-05ecbee-0851ad3-1586698-727bf66',
-  'id'  => 'LibreOffice 3.5.1 RC2',
-  'version' => '3.5.1 RC2',
-  'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/pre-releases/'),
 # To be uncommented when 3.5.2 RC2 is out, to get updates from 3.5.2 RC1
 #'LO-3.5-pre' => array('gitid'   => '',
 #  'id'  => 'LibreOffice 3.5.2 RC2',
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-15 Thread Lubos Lunak 
 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c5489e31b625e08fa2427108d5e710aba4468a27
Author: Luboš Luňák 
Date:   Wed Mar 14 14:34:22 2012 +0100

need to be afraid of empty quoted strings as test arguments

At least 07a841bc1acde95229ece2a0da4e2a70be5df624 says so.

diff --git a/configure.in b/configure.in
index e0bc4dd..f71014d 100644
--- a/configure.in
+++ b/configure.in
@@ -79,7 +79,7 @@ AC_SUBST(x_Cygwin)
 
 cat /dev/null > warn
 
-if test "$EUID" = "0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then
+if test "z$EUID" = "z0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then
 AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an 
administrative account])
 fi
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

2012-03-15 Thread David Tardon 
 vcl/source/gdi/print3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 504aead0573befc744a00b8b1d68e3ebbaca8c47
Author: David Tardon 
Date:   Thu Mar 15 14:15:09 2012 +0100

Revert "fix setting of paper tray from print dialog (fdo#43932)"

This reverts commit 6d4cca9c22c52b5a7742adc47ebf1a2930e29764.

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 817e6d5..4824203 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -773,7 +773,7 @@ PrinterController::PageSize 
vcl::ImplPrinterControllerData::modifyJobSetup( cons
 PrinterController::PageSize aPageSize;
 aPageSize.aSize = mpPrinter->GetPaperSize();
 awt::Size aSetSize, aIsSize;
-sal_Int32 nPaperBin = (mnFixedPaperBin != -1) ? mnFixedPaperBin : 
mnDefaultPaperBin;
+sal_Int32 nPaperBin = mnDefaultPaperBin;
 for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); 
nProperty < nPropertyCount; ++nProperty )
 {
 if( i_rProps[ nProperty ].Name.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM( "PreferredPageSize" ) ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Jan Holesovsky 
 sc/source/ui/view/prevwsh.cxx |3 +++
 sw/source/ui/uiview/pview.cxx |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit eeeb4d9a1c772b12aab515c8d5089fb6b5e003c7
Author: Szabolcs Dezsi 
Date:   Thu Mar 15 10:15:11 2012 +0100

Horizontal scrollbar fix in Writer and Calc Print Preview

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 9dbe51f..ccb10ee 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -309,18 +309,21 @@ void ScPreviewShell::UpdateScrollBars()
 //  page smaller than window -> center (but put scrollbar to 0)
 aOfs.X() = 0;
 pPreview->SetXOffset( nMaxPos / 2 );
+pHorScroll->Show( sal_False );
 }
 else if (aOfs.X() < 0)
 {
 //  page larger than window -> never use negative offset
 aOfs.X() = 0;
 pPreview->SetXOffset( 0 );
+pHorScroll->Show( sal_True );
 }
 else if (aOfs.X() > nMaxPos)
 {
 //  limit offset to align with right edge of window
 aOfs.X() = nMaxPos;
 pPreview->SetXOffset(nMaxPos);
+pHorScroll->Show( sal_True );
 }
 pHorScroll->SetThumbPos( aOfs.X() );
 }
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index ae2e1d7..b37baea 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1666,10 +1666,13 @@ void SwPagePreView::ScrollViewSzChg()
 
 if(rDocRect.GetWidth() < rPreviewSize.Width())
 {
+pHScrollbar->Show( sal_True );
 nVisWidth = rDocRect.GetWidth();
 nThumb = rDocRect.Left();
 aRange = Range(0, rPreviewSize.Width());
 }
+else
+pHScrollbar->Show( sal_False );
 pHScrollbar->SetRange( aRange );
 pHScrollbar->SetVisibleSize( nVisWidth );
 pHScrollbar->SetThumbPos( nThumb );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-03-15 Thread Michael Stahl 
 sw/source/core/text/xmldump.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e580246b475bba07f581452c03eff7617d06efc4
Author: Michael Stahl 
Date:   Thu Mar 15 13:32:14 2012 +0100

sw: xmldump: print pointers again

diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 3b0bfe4..e443f6d 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -345,6 +345,7 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer )
 
 void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
 {
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "ptr" ), "%p", this );
 xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "id" ), "%u", 
GetFrmId() );
 if ( GetNext( ) )
 xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "next" ), "%u", 
GetNext()->GetFrmId() );
@@ -378,6 +379,7 @@ void SwAnchoredObject::dumpAsXml( xmlTextWriterPtr writer )
 writer = lcl_createDefaultWriter();
 
 xmlTextWriterStartElement( writer, BAD_CAST( getElementName() ) );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "ptr" ), "%p", this );
 xmlTextWriterEndElement( writer );
 
 if ( bCreateWriter )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - binfilter/bf_sw binfilter/inc

2012-03-15 Thread Michael Meeks 
 binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx   |   36 +
 binfilter/bf_sw/source/filter/ascii/makefile.mk |2 
 binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx   |  226 
 binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx   |  234 
 binfilter/bf_sw/source/filter/ascii/wrtasc.hxx  |   57 +++
 binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx |  133 +++
 binfilter/bf_sw/source/filter/inc/wrt_fn.hxx|   76 
 binfilter/bf_sw/source/filter/makefile.mk   |1 
 binfilter/bf_sw/source/filter/writer/makefile.mk|4 
 binfilter/bf_sw/source/filter/writer/sw_writer.cxx  |  361 
 binfilter/bf_sw/source/filter/writer/sw_wrt_fn.cxx  |  129 +++
 binfilter/inc/bf_sw/shellio.hxx |  117 ++
 binfilter/inc/bf_sw/undobj.hxx  |   60 +++
 13 files changed, 1425 insertions(+), 11 deletions(-)

New commits:
commit a73d29c70cf5cc6ffeddfd5c5dada55a30d55fcc
Author: Caolán McNamara 
Date:   Wed Mar 14 11:06:16 2012 +

Resolves: fdo#45521 restore ascii export for getTextFromPam

We need getTextFromPam to get the text of a selection for the
uno api, which some parts of the export to xml require

Signed-off-by: Michael Meeks 

diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index b65f33e..e101cb4 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -255,7 +255,7 @@ void SwXTextCursor::SelectPam(SwPaM& rCrsr, sal_Bool 
bExpand)
 
 }
 
-void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString&)
+void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, OUString& rBuffer)
 {
 if(!aCrsr.HasMark())
 return;
@@ -265,22 +265,40 @@ void SwXTextCursor::getTextFromPam(SwPaM& aCrsr, 
OUString&)
 #else
 aStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 #endif
-/* this part is commented out since is not more executable due to the
-   deletion of the Writer class.
-   Investigation needs to be done in order to know if the function can be
-   removed too, or needs to be adapted
-*/
-/*WriterRef xWrt;
-SwIoSystem::GetWriter( C2S(FILTER_TEXT_DLG), xWrt );
+WriterRef xWrt = GetASCWriter(C2S(FILTER_TEXT_DLG));
 if( xWrt.Is() )
 {
+SwWriter aWriter( aStream, aCrsr );
 xWrt->bASCII_NoLastLineEnd = sal_True;
 SwAsciiOptions aOpt = xWrt->GetAsciiOptions();
 aOpt.SetCharSet( RTL_TEXTENCODING_UNICODE );
 xWrt->SetAsciiOptions( aOpt );
 xWrt->bUCS2_WithStartChar = FALSE;
+
+long lLen;
+if( !IsError( aWriter.Write( xWrt ) ) &&
+STRING_MAXLEN > (( lLen  = aStream.GetSize() )
+/ sizeof( sal_Unicode )) + 1 )
+{
+aStream << (sal_Unicode)'\0';
+
+String sBuf;
+const sal_Unicode *p = (sal_Unicode*)aStream.GetBuffer();
+if( p )
+sBuf = p;
+else
+{
+long lUniLen = (lLen / sizeof( sal_Unicode ));
+sal_Unicode* pStrBuf = sBuf.AllocBuffer( xub_StrLen(
+lUniLen + 1));
+aStream.Seek( 0 );
+aStream.ResetError();
+aStream.Read( pStrBuf, lLen );
+pStrBuf[ lUniLen ] = '\0';
+}
+rBuffer = OUString( sBuf );
+}
 }
-*/
 }
 
 void lcl_setCharStyle(SwDoc* pDoc, const uno::Any aValue, SfxItemSet& rSet)
diff --git a/binfilter/bf_sw/source/filter/ascii/makefile.mk 
b/binfilter/bf_sw/source/filter/ascii/makefile.mk
index c653997..5b57a44 100644
--- a/binfilter/bf_sw/source/filter/ascii/makefile.mk
+++ b/binfilter/bf_sw/source/filter/ascii/makefile.mk
@@ -42,6 +42,8 @@ INC+= -I$(PRJ)$/inc$/bf_sw
 # --- Files 
 
 SLOFILES = \
+$(SLO)$/sw_ascatr.obj \
+$(SLO)$/sw_wrtasc.obj
 
 # --- Tagets ---
 
diff --git a/binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx 
b/binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx
new file mode 100644
index 000..30247ec
--- /dev/null
+++ b/binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx
@@ -0,0 +1,226 @@
+/* -*- 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

[Libreoffice-commits] .: solenv/gbuild solenv/inc

2012-03-15 Thread Lubos Lunak 
 solenv/gbuild/platform/unxgcc.mk |4 
 solenv/inc/unxgcc.mk |4 
 2 files changed, 8 insertions(+)

New commits:
commit cc9a10185749210825fe6970ea4b103eb78e329e
Author: Luboš Luňák 
Date:   Thu Mar 15 10:30:39 2012 +0100

clang doesn't have a problem with -Wnon-virtual-dtor

Even if some older version possibly does, I doubt anybody would
realistically use it.

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 1565d1c..9c2b405 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -65,6 +65,7 @@ gb_CXXFLAGS := \
-Wsign-promo \
-Woverloaded-virtual \
 
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
 # Only GCC 4.6 has a fix for 
 # "-Wnon-virtual-dtor should't complain of protected dtor" and supports #pragma
 # GCC diagnostic push/pop required e.g. in cppuhelper/propertysetmixin.hxx to
@@ -75,6 +76,9 @@ gb_CXXFLAGS += -Wno-non-virtual-dtor
 else
 gb_CXXFLAGS += -Wnon-virtual-dtor
 endif
+else
+gb_CXXFLAGS += -Wnon-virtual-dtor
+endif
 
 ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
 gb_COMPILERDEFS += \
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 5ef9f98..4f9ebee 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -148,6 +148,7 @@ CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR
 
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
 # Only GCC 4.6 has a fix for 
 # "-Wnon-virtual-dtor should't complain of protected dtor" and supports #pragma
 # GCC diagnostic push/pop required e.g. in cppuhelper/propertysetmixin.hxx to
@@ -158,6 +159,9 @@ CFLAGSWARNCXX += -Wno-non-virtual-dtor
 .ELSE
 CFLAGSWARNCXX += -Wnon-virtual-dtor
 .END
+.ELSE
+CFLAGSWARNCXX += -Wnon-virtual-dtor
+.END
 
 COMPILER_WARN_ERRORS=TRUE
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild solenv/inc

2012-03-15 Thread Lubos Lunak 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 +
 solenv/inc/wntmsc.mk|4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 370b3b6232a0851d68bb894c2b8ee71b9504384b
Author: Lubos Lunak 
Date:   Thu Mar 15 11:45:08 2012 +0100

disable msvc warning 4265 (non-virtual dtor)

msvc2008 now prints out a lot of warnings, probably a result
of the recent -Wnon-virtual-dtor changes where msvc does not
understand the protected dtor actually makes the code to be ok

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 6902642..ab7728e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -147,6 +147,7 @@ gb_CXXFLAGS := \
-wd4245 \
-wd4250 \
-wd4251 \
+   -wd4265 \
-wd4275 \
-wd4290 \
-wd4294 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index f7b2dbe..afafe38 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -173,6 +173,8 @@ CFLAGSOUTOBJ=-Fo
 #   (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx)
 # - "warning C4180: qualifier applied to function type has no meaning; ignored"
 #   (frequently seen with a recent boost)
+# - "warning C4265: 'identifier' : class has virtual functions, but destructor 
is not
+#   virtual"
 # For C, certain warnings from system headers (stdlib.h etc.) have to be
 # disabled globally (for C++, this is not necessary, as the system headers are
 # wrapped by STLport):
@@ -184,7 +186,7 @@ CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 
-wd4244 -wd4245 -wd4
 -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4555 -wd4611 -wd4625 
-wd4626 \
 -wd4640 -wd4675 -wd4686 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 
-wd4503 -wd4619 \
 -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
--wd4180
+-wd4180 -wd4265
 CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-15 Thread Michael Meeks 
 configmgr/source/components.cxx |   40 +++-
 1 file changed, 31 insertions(+), 9 deletions(-)

New commits:
commit 4f78696117ebe4f729880b5d9bfc2f5817b73543
Author: Stephan Bergmann 
Date:   Thu Mar 15 09:34:56 2012 +0100

fdo#42961 Don't let env vars interfere with internal bootstrap vars

Signed-off-by: Michael Meeks 

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 48d555e..a341d84 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -54,6 +54,7 @@
 #include "rtl/oustringostreaminserter.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/string.h"
+#include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "rtl/instance.hxx"
@@ -838,17 +839,38 @@ void Components::parseXcsXcuLayer(int layer, 
rtl::OUString const & url) {
 void Components::parseXcsXcuIniLayer(
 int layer, rtl::OUString const & url, bool recordAdditions)
 {
-//TODO: rtl::Bootstrap::getFrom "first trie[s] to retrieve the value via 
the
-// global function"
+// Check if ini file exists (otherwise .override would still read global
+// SCHEMA/DATA variables, which could interfere with unrelated environment
+// variables):
 rtl::Bootstrap ini(url);
-rtl::OUString urls;
-if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SCHEMA")), 
urls))
+if (ini.getHandle() != 0)
 {
-parseFileList(layer, &parseXcsFile, urls, ini, false);
-}
-if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA")), urls))
-{
-parseFileList(layer + 1, &parseXcuFile, urls, ini, recordAdditions);
+rtl::OUStringBuffer prefix("${.override:");
+for (sal_Int32 i = 0; i != url.getLength(); ++i) {
+sal_Unicode c = url[i];
+switch (c) {
+case '$':
+case ':':
+case '\\':
+prefix.append('\\');
+// fall through
+default:
+prefix.append(c);
+}
+}
+prefix.append(':');
+rtl::OUString urls(prefix.toString() + rtl::OUString("SCHEMA}"));
+rtl::Bootstrap::expandMacros(urls);
+if (!urls.isEmpty())
+{
+parseFileList(layer, &parseXcsFile, urls, ini, false);
+}
+urls = prefix.makeStringAndClear() + rtl::OUString("DATA}");
+rtl::Bootstrap::expandMacros(urls);
+if (!urls.isEmpty())
+{
+parseFileList(layer + 1, &parseXcuFile, urls, ini, 
recordAdditions);
+}
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: fpicker/Library_fps.mk fpicker/source

2012-03-15 Thread Michael Stahl 
 fpicker/Library_fps.mk |1 
 fpicker/source/win32/folderpicker/Fopentry.cxx |  102 -
 2 files changed, 103 deletions(-)

New commits:
commit f04e6b0e965e3a4301e705fb41a15c5560765b5b
Author: Michael Stahl 
Date:   Thu Mar 15 10:28:33 2012 +0100

fdo#47246: fpicker: merge fop into fps: remove Fopentry.cxx

Forgot that in 095528351c3c916ef3c79f7275113ec628b4d473.

diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index e70bdf4..986b167 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,fps,\
fpicker/source/win32/filepicker/VistaFilePickerImpl \
fpicker/source/win32/filepicker/WinFileOpenImpl \
fpicker/source/win32/folderpicker/FolderPicker \
-   fpicker/source/win32/folderpicker/Fopentry \
fpicker/source/win32/folderpicker/MtaFop \
fpicker/source/win32/folderpicker/WinFOPImpl \
fpicker/source/win32/misc/AutoBuffer \
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx 
b/fpicker/source/win32/folderpicker/Fopentry.cxx
deleted file mode 100644
index e90ea62..000
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ /dev/null
@@ -1,102 +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.
- *
- /
-
-
-//---
-//  includes of other projects
-//---
-#include 
-#include 
-#include 
-
-#include "FolderPicker.hxx"
-
-#include "FOPServiceInfo.hxx"
-#include "WinFOPImpl.hxx"
-
-//---
-// namespace directives
-//---
-
-using namespace ::rtl   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::container ;
-using namespace ::com::sun::star::lang  ;
-using namespace ::com::sun::star::registry  ;
-using namespace ::cppu  ;
-using com::sun::star::ui::dialogs::XFolderPicker;
-
-
-namespace
-{
-
-//---
-//
-//---
-
-Reference< XInterface > SAL_CALL createInstance( const Reference< 
XMultiServiceFactory >& rServiceManager )
-{
-return Reference< XInterface >( static_cast< XFolderPicker* >( new 
CFolderPicker( rServiceManager ) ) );
-}
-}
-
-extern "C"
-{
-
-//--
-// component_getFactory
-// returns a factory to create XFilePicker-Services
-//--
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* 
pImplName, uno_Interface* pSrvManager, uno_Interface* )
-{
-void* pRet = 0;
-
-if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, 
FOLDER_PICKER_IMPL_NAME ) ) )
-{
-Sequence< OUString > aSNS( 1 );
-aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( 
FOLDER_PICKER_SERVICE_NAME ) );
-
-Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
-reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
-OUString::createFromAscii( pImplName ),
-createInstance,
-aSNS ) );
-if ( xFactory.is() )
-{
-xFactory->acquire();
-pRet = xFactory.get();
-}
-}
-
-return pRet;
-}
-
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffi

[Libreoffice-commits] .: fpicker/source

2012-03-15 Thread David Tardon 
 fpicker/source/win32/filepicker/FPentry.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d5e83535a5ab32dc0730e6edab116855875bfa74
Author: David Tardon 
Date:   Thu Mar 15 10:28:07 2012 +0100

error: 'XFolderPicker' was not declared in this scope

diff --git a/fpicker/source/win32/filepicker/FPentry.cxx 
b/fpicker/source/win32/filepicker/FPentry.cxx
index 0242171..3c1e0c0 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -59,6 +59,7 @@ using namespace ::com::sun::star::registry  ;
 using namespace ::cppu  ;
 using ::com::sun::star::ui::dialogs::XFilePicker;
 using ::com::sun::star::ui::dialogs::XFilePicker2;
+using ::com::sun::star::ui::dialogs::XFolderPicker;
 
 //
 //
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configmgr/source

2012-03-15 Thread Stephan Bergmann 
 configmgr/source/components.cxx |   40 +++-
 1 file changed, 31 insertions(+), 9 deletions(-)

New commits:
commit 84ecea9655267afc266b79059baa4512a285b1f2
Author: Stephan Bergmann 
Date:   Thu Mar 15 09:34:56 2012 +0100

fdo#42961 Don't let env vars interfere with internal bootstrap vars

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 0e1c7e4..6f18508 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -53,6 +53,7 @@
 #include "rtl/oustringostreaminserter.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/string.h"
+#include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "rtl/instance.hxx"
@@ -827,17 +828,38 @@ void Components::parseXcsXcuLayer(int layer, 
rtl::OUString const & url) {
 void Components::parseXcsXcuIniLayer(
 int layer, rtl::OUString const & url, bool recordAdditions)
 {
-//TODO: rtl::Bootstrap::getFrom "first trie[s] to retrieve the value via 
the
-// global function"
+// Check if ini file exists (otherwise .override would still read global
+// SCHEMA/DATA variables, which could interfere with unrelated environment
+// variables):
 rtl::Bootstrap ini(url);
-rtl::OUString urls;
-if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SCHEMA")), 
urls))
+if (ini.getHandle() != 0)
 {
-parseFileList(layer, &parseXcsFile, urls, ini, false);
-}
-if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA")), urls))
-{
-parseFileList(layer + 1, &parseXcuFile, urls, ini, recordAdditions);
+rtl::OUStringBuffer prefix("${.override:");
+for (sal_Int32 i = 0; i != url.getLength(); ++i) {
+sal_Unicode c = url[i];
+switch (c) {
+case '$':
+case ':':
+case '\\':
+prefix.append('\\');
+// fall through
+default:
+prefix.append(c);
+}
+}
+prefix.append(':');
+rtl::OUString urls(prefix.toString() + rtl::OUString("SCHEMA}"));
+rtl::Bootstrap::expandMacros(urls);
+if (!urls.isEmpty())
+{
+parseFileList(layer, &parseXcsFile, urls, ini, false);
+}
+urls = prefix.makeStringAndClear() + rtl::OUString("DATA}");
+rtl::Bootstrap::expandMacros(urls);
+if (!urls.isEmpty())
+{
+parseFileList(layer + 1, &parseXcuFile, urls, ini, 
recordAdditions);
+}
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-03-15 Thread David Tardon 
 sc/source/core/data/document.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32dc82b9d456ed92ba946611239349ab0e424e2a
Author: David Tardon 
Date:   Thu Mar 15 09:43:26 2012 +0100

fdo#47311 don't crash when pasting into more than 1 sheet

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2a5c751..60ba818 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2277,7 +2277,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW 
nRow1,
 while ( i + nFollow < nTabEnd
 && rMark.GetTableSelect( i + nFollow + 1 )
 && nClipTab + nFollow < MAXTAB
-&& rClipTabs[nClipTab + nFollow + 1] )
+&& rClipTabs[(nClipTab + nFollow + 1) % 
static_cast(rClipTabs.size())] )
 ++nFollow;
 
 if ( pCBFCP->pClipDoc->GetClipParam().mbCutMode )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits