date:20111211

 distro-configs/LibreOfficeMacOSX.conf |2 ++
 postgresql/makefile.mk|2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bee80a2a5762ab483b64b6d9b38d39ed3ffeca1f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sun Dec 11 12:24:38 2011 +0100

Make internal pgsql build on mac and make it default for release

diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 3d22aa9..59ea95b 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -10,4 +10,6 @@
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript
 --enable-ext-nlpsolver
+--enable-ext-postgresql-sdbc
 --enable-extension-integration
+--without-system-postgresql
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 2aae5db..2979779 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -63,7 +63,7 @@ BUILD_DIR=src/interfaces/libpq
 # --sysconfdir: config files. Ideally, we would like that to be the same as 
the platform default,
 #   but that's quite some guessing work.
 CONFIGURE_ACTION = ./configure --without-readline --disable-shared
-BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM)
+BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF
 
 # --- Targets --
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

 svtools/source/svhtml/htmlout.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a1b970a10e00b34ab6d8608cb02247b8f0195573
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 11 13:07:04 2011 +0100

Remove ByteString

diff --git a/svtools/source/svhtml/htmlout.cxx 
b/svtools/source/svhtml/htmlout.cxx
index deb530b..cf3f746 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -885,9 +885,8 @@ SvStream HTMLOutFuncs::OutScript( SvStream rStrm,
 {
 // Wir schreiben das Modul mm ANSI-Zeichensatz, aber mit
 // System-Zeilenumbruechen raus.
-ByteString sSource(rtl::OUStringToOString(rSource, eDestEnc));
-sSource.ConvertLineEnd( GetSystemLineEnd() );
-rStrm  sSource.GetBuffer();
+rtl::OString sSource(rtl::OUStringToOString(rSource, eDestEnc));
+rStrm  sSource.getStr()  sNewLine;
 }
 rStrm  sNewLine;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sot/source

 sot/source/base/formats.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4046a1dfc2ba5b52cab7083f4817351c647a59c3
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 11 13:45:53 2011 +0100

Remove ByteString

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 2bfa066..1c5ec07 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1325,8 +1325,7 @@ rEntry
 
 if( pFDesc-cItems )
 {
-ByteString sDesc( pFDesc-fgd[ 0 
].cFileName );
-bRet = 4  sDesc.Len()  sDesc.Copy( 
sDesc.Len()-4 ).EqualsIgnoreCaseAscii( .URL );
+bRet = (4  (pFDesc-fgd[ 0 
].cFileName.size()))  sDesc.Copy( sDesc.Len()-4 ).EqualsIgnoreCaseAscii( 
.URL );
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/source sc/source svx/source

 desktop/source/deployment/manager/dp_manager.cxx |2 +-
 sc/source/filter/xml/xmlexprt.cxx|4 ++--
 svx/source/xml/xmlgrhlp.cxx  |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit eba2e6a9c32d5c5a7bdb4c8ccc515903b247c12d
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 11 14:48:16 2011 +0100

Remove ByteString

diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index 508d6bb..63720c5 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1037,7 +1037,7 @@ Referencedeployment::XPackage 
PackageManagerImpl::getDeployedPackage_(
 if (INetContentTypes::parse( data.mediaType, type, subType, params ))
 {
 INetContentTypeParameter const * param = params.find(
-ByteString(platform) );
+rtl::OString(platform) );
 if (param != 0  !platform_fits( param-m_sValue ))
 throw lang::IllegalArgumentException(
 getResourceString(RID_STR_NO_SUCH_PACKAGE) + id,
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 3ad8b8b..1757c6b 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1650,8 +1650,8 @@ void ScXMLExport::CopySourceStream( sal_Int32 
nStartOffset, sal_Int32 nEndOffset
 
 if ( getExportFlags()  EXPORT_PRETTY )
 {
-ByteString aOutStr(\n   );
-uno::Sequencesal_Int8 aOutSeq( 
(sal_Int8*)aOutStr.GetBuffer(), aOutStr.Len() );
+const rtl::OString aOutStr(\n   );
+uno::Sequencesal_Int8 aOutSeq( (sal_Int8*)aOutStr.getStr(), 
aOutStr.getLength() );
 xDestStream-writeBytes( aOutSeq );
 }
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 3fc611c..3d61519 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -548,11 +548,11 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const 
String rFileName ) con
 
 if( ( rFileName.Len() = 4 )  ( rFileName.GetChar( rFileName.Len() - 4 ) 
== '.' ) )
 {
-const ByteString 
aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3),
+const rtl::OString 
aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3),
 RTL_TEXTENCODING_ASCII_US));
 
 for( long i = 0, nCount = SAL_N_ELEMENTS( aMapper ); ( i  nCount )  
!aMimeType.Len(); i++ )
-if( aExt == aMapper[ i ].pExt )
+if( aExt.getStr() == aMapper[ i ].pExt )
 aMimeType = String( aMapper[ i ].pMimeType, 
RTL_TEXTENCODING_ASCII_US );
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

 dbaccess/source/ui/dlg/directsql.cxx |3 +++
 dbaccess/source/ui/inc/directsql.hxx |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 15f8fce9860100505c4c6a54f5f003375fbd8275
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 11 16:36:38 2011 +0100

Remove ByteString

diff --git a/dbaccess/source/ui/dlg/directsql.cxx 
b/dbaccess/source/ui/dlg/directsql.cxx
index f0d6f0d..e650fb3 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -36,6 +36,7 @@
 #include vcl/svapp.hxx
 #include osl/mutex.hxx
 #include tools/diagnose_ex.h
+#include rtl/strbuf.hxx
 
 //
 namespace dbaui
@@ -46,6 +47,8 @@ namespace dbaui
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
+using ::rtl::OStringBuffer;
+
 //
 //= LargeEntryListBox
 //
diff --git a/dbaccess/source/ui/inc/directsql.hxx 
b/dbaccess/source/ui/inc/directsql.hxx
index 250c667..96c2ebc 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -126,7 +126,7 @@ namespace dbaui
 {   \
 const sal_Char* pError = impl_CheckInvariants();\
 if (pError) \
-OSL_FAIL((ByteString(methodname) += ByteString(: ) += 
ByteString(pError)).GetBuffer());   \
+OSL_FAIL(rtl::OStringBuffer(methodname).append(: 
).append(pError). makeStringAndClear().getStr());   \
 }
 #else
 #define CHECK_INVARIANTS(methodname)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-12-11 Thread August Sodora

 vcl/inc/vcl/outdev.hxx  |   33 -
 vcl/source/gdi/outdev2.cxx  |   38 --
 vcl/source/gdi/outdev3.cxx  |   27 
 vcl/source/gdi/outdevnative.cxx |   39 ---
 vcl/source/gdi/outmap.cxx   |  222 
 5 files changed, 359 deletions(-)

New commits:
commit bb11106e06fa47a105bd02c2281f20af147b71b6
Author: August Sodora aug...@gmail.com
Date:   Sun Dec 11 00:36:49 2011 -0500

Remove unused code

diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index d2d3809..9ce143d 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -416,7 +416,6 @@ public:
 const sal_Int32* pPixelDXArray ) 
const;
 SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, 
ImplLayoutArgs ) const;
 
-SAL_DLLPRIVATE long ImplGetTextWidth( const SalLayout ) const;
 static
 SAL_DLLPRIVATE XubStringImplGetEllipsisString( const OutputDevice 
rTargetDevice, const XubString rStr,
long nMaxWidth, 
sal_uInt16 nStyle, const ::vcl::ITextLayout _rLayout );
@@ -458,10 +457,7 @@ public:
 SAL_DLLPRIVATE long ImplLogicHeightToDevicePixel( long nHeight ) 
const;
 SAL_DLLPRIVATE long ImplDevicePixelToLogicWidth( long nWidth ) 
const;
 SAL_DLLPRIVATE long ImplDevicePixelToLogicHeight( long nHeight ) 
const;
-SAL_DLLPRIVATE floatImplFloatLogicWidthToDevicePixel( float ) 
const;
 SAL_DLLPRIVATE floatImplFloatLogicHeightToDevicePixel( float ) 
const;
-SAL_DLLPRIVATE floatImplFloatDevicePixelToLogicWidth( float ) 
const;
-SAL_DLLPRIVATE floatImplFloatDevicePixelToLogicHeight( float ) 
const;
 SAL_DLLPRIVATE PointImplLogicToDevicePixel( const Point rLogicPt 
) const;
 SAL_DLLPRIVATE Size ImplLogicToDevicePixel( const Size rLogicSize 
) const;
 SAL_DLLPRIVATE RectangleImplLogicToDevicePixel( const Rectangle 
rLogicRect ) const;
@@ -601,7 +597,6 @@ public:
   FontUnderline eUnderline,
   FontUnderline eOverline,
   sal_Bool bUnderlineAbove = sal_False );
-static sal_Bool IsTextUnderlineAbove( const Font rFont );
 
 voidDrawText( const Point rStartPt, const XubString rStr,
   xub_StrLen nIndex = 0, xub_StrLen nLen = 
STRING_LEN,
@@ -830,7 +825,6 @@ public:
const ::vcl::RenderGraphic 
rRenderGraphic );
 
 Color   GetPixel( const Point rPt ) const;
-Color*  GetPixel( const Polygon rPts ) const;
 
 Bitmap  GetBitmap( const Point rSrcPt, const Size rSize ) 
const;
 
@@ -992,9 +986,7 @@ public:
 SizeLogicToPixel( const Size rLogicSize ) const;
 Rectangle   LogicToPixel( const Rectangle rLogicRect ) const;
 Polygon LogicToPixel( const Polygon rLogicPoly ) const;
-basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon 
rLogicPolyPoly ) const;
 PolyPolygon LogicToPixel( const PolyPolygon rLogicPolyPoly ) 
const;
-basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon 
rLogicPolyPoly ) const;
 Region  LogicToPixel( const Region rLogicRegion )const;
 Point   LogicToPixel( const Point rLogicPt,
   const MapMode rMapMode ) const;
@@ -1004,21 +996,15 @@ public:
   const MapMode rMapMode ) const;
 Polygon LogicToPixel( const Polygon rLogicPoly,
   const MapMode rMapMode ) const;
-basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon rLogicPoly,
-  const MapMode rMapMode ) const;
 PolyPolygon LogicToPixel( const PolyPolygon rLogicPolyPoly,
   const MapMode rMapMode ) const;
 basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon 
rLogicPolyPoly,
   const MapMode rMapMode ) const;
-Region  LogicToPixel( const Region rLogicRegion,
-  const MapMode rMapMode ) const;
 Point   PixelToLogic( const Point rDevicePt ) const;
 SizePixelToLogic( const Size rDeviceSize ) const;
 Rectangle   PixelToLogic( const Rectangle rDeviceRect ) const;
 Polygon PixelToLogic( const Polygon rDevicePoly ) const;
-basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon rDevicePoly ) 
const;
 PolyPolygon PixelToLogic( const PolyPolygon rDevicePolyPoly ) 
const;
-basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon 
rDevicePolyPoly ) const;
 Region

[Libreoffice-commits] .: dbaccess/source

 dbaccess/source/ui/misc/moduledbu.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5c4503898742a151e7521cae0649ff5eb6f19220
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 11 20:38:34 2011 +0100

Remove ByteString

diff --git a/dbaccess/source/ui/misc/moduledbu.cxx 
b/dbaccess/source/ui/misc/moduledbu.cxx
index dfd95ae..18c2888 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -86,8 +86,7 @@ ResMgr* OModuleImpl::getResManager()
 if (!m_pRessources)
 {
 // create a manager with a fixed prefix
-ByteString aMgrName = ByteString( dbu );
-m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer());
+m_pRessources = ResMgr::CreateResMgr(rtl::OString(dbu).getStr());
 }
 return m_pRessources;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-11 Thread Andras Timar

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f129c4f766c30b174544ec234cbd72c7050a2fc1
Author: Andras Timar ati...@suse.com
Date:   Sun Dec 11 22:04:34 2011 +0100

fix VersionInfo resource build under MinGW

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 7363654..92b4dbb 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -346,6 +346,8 @@ $(call gb_WinResTarget_WinResTarget_init,$(2))
 $(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
 $(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \
+   -DVERVARIANT=$(BUILD) \
+   -DRES_APP_VENDOR=$(OOO_VENDOR) \
-DADDITIONAL_VERINFO1= \
-DADDITIONAL_VERINFO2= \
-DADDITIONAL_VERINFO3= \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sot/source

 sot/source/base/formats.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 60beba6a73c46d4564599467badd6136f9523434
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Dec 11 22:30:46 2011 +0100

Revert buggy 4046a1dfc2ba5b52cab7083f4817351c647a59c3

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 1c5ec07..2bfa066 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1325,7 +1325,8 @@ rEntry
 
 if( pFDesc-cItems )
 {
-bRet = (4  (pFDesc-fgd[ 0 
].cFileName.size()))  sDesc.Copy( sDesc.Len()-4 ).EqualsIgnoreCaseAscii( 
.URL );
+ByteString sDesc( pFDesc-fgd[ 0 
].cFileName );
+bRet = 4  sDesc.Len()  sDesc.Copy( 
sDesc.Len()-4 ).EqualsIgnoreCaseAscii( .URL );
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-11 Thread Peter Foley

 solenv/gbuild/extensions/post_AuxTargets.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a298986d627b944eb94fdd8b0c30a9298f14ab65
Author: Peter Foley pefol...@verizon.net
Date:   Sun Dec 11 19:39:58 2011 -0500

alow make to run autogen.sh if autogen.lastrun doesn't exist

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index 7622047..da31aa6 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -51,6 +51,8 @@ fetch: $(SRCDIR)/src.downloaded
 $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
$(if $(filter 
reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo cannot 
reconfigure from within solarenv  rm -f $(SRCDIR)/Env.Host.sh  exit 2)
 
+autogen.lastrun:
+
 $(WORKDIR)/bootstrap:
@cd $(SRCDIR)  ./bootstrap
@mkdir -p $(dir $@)  touch $@
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-12-11 Thread Noel Power

 sc/source/ui/app/inputwin.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bee8375b7205d4a468a2d3a928249e7923b2147a
Author: Noel Power noel.po...@novell.com
Date:   Mon Dec 12 00:59:52 2011 +

double check pEditView ( appears some re-entrency foo can zap it )

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2983c44..649050b 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -,7 +,9 @@ ScMultiTextWnd::~ScMultiTextWnd()
 
 void ScMultiTextWnd::Paint( const Rectangle rRec )
 {
-GetEditView()-Paint( rRec );
+EditView* pView = GetEditView();
+if ( pView )
+pView-Paint( rRec );
 }
 
 EditView* ScMultiTextWnd::GetEditView()
___
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 - sc/source

2011-12-11 Thread Noel Power

 sc/source/ui/app/inputhdl.cxx |3 ++-
 sc/source/ui/app/inputwin.cxx |   33 +++--
 sc/source/ui/inc/inputwin.hxx |2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 1b28a657678f2cc64861030cbe3bea13d1bebd95
Author: Noel Power noel.po...@novell.com
Date:   Mon Dec 12 00:59:52 2011 +

double check pEditView ( appears some re-entrency foo can zap it )

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2983c44..649050b 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -,7 +,9 @@ ScMultiTextWnd::~ScMultiTextWnd()
 
 void ScMultiTextWnd::Paint( const Rectangle rRec )
 {
-GetEditView()-Paint( rRec );
+EditView* pView = GetEditView();
+if ( pView )
+pView-Paint( rRec );
 }
 
 EditView* ScMultiTextWnd::GetEditView()
commit 445d348837aca032b81edc92a23fee128758ee0f
Author: Noel Power noel.po...@novell.com
Date:   Sun Dec 11 16:40:52 2011 +

fix autocorrection sync problem with input/formulabar

also,
* make the GetEditView explicitly create EditEngine/EditView *always*
* remove the bogus GetLine method
* reset NotifyHdl when stopping the edit engine

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f4fe965..98cfac2 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2046,7 +2046,8 @@ void ScInputHandler::SyncViews( EditView* pSourceView )
 if (pTableView  pTableView != pSourceView)
 lcl_SetTopSelection( pTableView, aSel );
 }
-else if (pTopView  pTableView)
+// Only sync selection from topView if we are actually editiing there
+else if ( ( eMode == SC_INPUT_TOP )  pTopView  pTableView)
 {
 aSel = pTopView-GetSelection();
 lcl_SetTopSelection( pTableView, aSel );
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 83bdb8a..2983c44 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1109,29 +1109,18 @@ ScMultiTextWnd::~ScMultiTextWnd()
 {
 }
 
-int ScMultiTextWnd::GetLineCount()
+void ScMultiTextWnd::Paint( const Rectangle rRec )
 {
-   if(pEditView)
-   {
-   return pEditEngine-GetLineCount(0);
-   }
-   return 1;
+GetEditView()-Paint( rRec );
 }
 
-void ScMultiTextWnd::Paint( const Rectangle rRec )
+EditView* ScMultiTextWnd::GetEditView()
 {
-// We always use edit engine to draw text at all times.
-if (!pEditEngine)
-InitEditEngine(SfxObjectShell::Current());
-//StartEditEngine();
-
-if (pEditView)
-{
-pEditView-Paint(rRec);
-}
+if ( !pEditView )
+InitEditEngine( SfxObjectShell::Current() );
+return pEditView;
 }
 
-
 long ScMultiTextWnd::GetPixelHeightForLines( long nLines )
 {
 long height = ( LogicToPixel(Size(0,GetTextHeight())).Height() );
@@ -1229,7 +1218,6 @@ ScMultiTextWnd::DoScroll()
 void ScMultiTextWnd::StartEditEngine()
 {
 // Bei eigener Modalitaet (Doc-modale Dialoge) nicht aktivieren
-
 SfxObjectShell* pObjSh = SfxObjectShell::Current();
 if ( pObjSh  pObjSh-IsInModalMode() )
 return;
@@ -1393,11 +1381,18 @@ void ScMultiTextWnd::InitEditEngine(SfxObjectShell* 
pObjSh)
 
 void ScMultiTextWnd::StopEditEngine( sal_Bool bAll )
 {
+if ( pEditEngine )
+pEditEngine-SetNotifyHdl(Link());
 ScTextWnd::StopEditEngine( bAll );
 }
 
 void ScMultiTextWnd::SetTextString( const String rNewString )
 {
+// Ideally it would be best to create on demand the EditEngine/EditView 
here, but... for
+// the initialisation scenario where a cell is first clicked on we end up 
with the text in the
+// inputbar window scrolled to the bottom if we do that here ( because the 
tableview and topview
+// are synced I guess ).
+// should fix that I suppose :-/ need to look a bit further into that
 if ( pEditView )
 pEditView-Invalidate();
 ScTextWnd::SetTextString( rNewString );
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index c0f4234..9f70ecb 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -176,8 +176,8 @@ public:
 virtual ~ScMultiTextWnd();
 virtual void StartEditEngine();
 virtual void StopEditEngine( sal_Bool bAll );
-int GetLineCount();
 virtual void Resize();
+virtual EditView*  GetEditView();
 long GetPixelHeightForLines( long nLines );
 long GetEditEngTxtHeight();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: fileaccess/source filter/source forms/source

2011-12-11 Thread Takeshi Abe

 fileaccess/source/FileAccess.cxx |4 +-
 filter/source/config/cache/filterfactory.cxx |2 -
 filter/source/flash/swfexporter.cxx  |   10 +++
 filter/source/graphicfilter/icgm/cgm.cxx |2 -
 filter/source/graphicfilter/itiff/itiff.cxx  |6 ++--
 filter/source/msfilter/escherex.cxx  |   10 +++
 filter/source/msfilter/eschesdo.cxx  |4 +-
 filter/source/msfilter/msdffimp.cxx  |6 ++--
 filter/source/msfilter/msoleexp.cxx  |   14 +-
 filter/source/msfilter/mstoolbar.cxx |4 +-
 filter/source/msfilter/msvbahelper.cxx   |6 ++--
 filter/source/msfilter/powerpoint/pptimporter.cxx|2 -
 filter/source/msfilter/svdfppt.cxx   |   10 +++
 filter/source/odfflatxml/OdfFlatXml.cxx  |2 -
 filter/source/pdf/impdialog.cxx  |4 +-
 filter/source/pdf/pdfexport.cxx  |4 +-
 filter/source/svg/test/svg2odf.cxx   |2 -
 filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx  |8 ++---
 filter/source/xmlfilterdetect/filterdetect.cxx   |2 -
 filter/source/xsltdialog/typedetectionexport.cxx |6 ++--
 filter/source/xsltdialog/typedetectionimport.cxx |2 -
 filter/source/xsltdialog/xmlfileview.cxx |2 -
 filter/source/xsltdialog/xmlfilterjar.cxx|   10 +++
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |   26 +--
 filter/source/xsltdialog/xmlfiltertabdialog.cxx  |4 +-
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx|2 -
 filter/source/xsltdialog/xmlfiltertestdialog.cxx |   16 +--
 filter/source/xsltfilter/XSLTFilter.cxx  |6 ++--
 forms/source/component/CheckBox.cxx  |2 -
 forms/source/component/ComboBox.cxx  |4 +-
 forms/source/component/Currency.cxx  |4 +-
 forms/source/component/Date.cxx  |4 +-
 forms/source/component/FormComponent.cxx |4 +-
 forms/source/component/FormattedField.cxx|8 ++---
 forms/source/component/ImageControl.cxx  |2 -
 forms/source/component/ListBox.cxx   |4 +-
 forms/source/component/Numeric.cxx   |2 -
 forms/source/component/RadioButton.cxx   |2 -
 forms/source/component/Time.cxx  |4 +-
 forms/source/misc/InterfaceContainer.cxx |7 ++---
 forms/source/runtime/formoperations.cxx  |2 -
 forms/source/xforms/propertysetbase.cxx  |2 -
 forms/source/xforms/submission/replace.cxx   |2 -
 forms/source/xforms/submission/submission_get.cxx|4 +-
 forms/source/xforms/submission/submission_post.cxx   |4 +-
 forms/source/xforms/submission/submission_put.cxx|2 -
 forms/source/xforms/xpathlib/xpathlib.cxx|4 +-
 47 files changed, 121 insertions(+), 122 deletions(-)

New commits:
commit 75b835c8cd2953c5bc0f23df300ee553f94eb28d
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sun Dec 11 18:51:50 2011 +0900

catch exception by constant reference

diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index a19d909..15867f8 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -396,7 +396,7 @@ sal_Bool OFileAccess::isFolder( const rtl::OUString 
FileURL )
 ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE 
), mxEnvironment );
 bRet = aCnt.isFolder();
 }
-catch (Exception ) {}
+catch (const Exception ) {}
 return bRet;
 }
 
@@ -600,7 +600,7 @@ sal_Bool OFileAccess::exists( const rtl::OUString FileURL )
 xStream-closeInput();
 }
 }
-catch (Exception ) {}
+catch (const Exception ) {}
 return bRet;
 }
 
diff --git a/filter/source/config/cache/filterfactory.cxx 
b/filter/source/config/cache/filterfactory.cxx
index ec3254d..f2b138e 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -461,7 +461,7 @@ class stlcomp_removeIfMatchFlags
 // We are asked for bRemove ! And bMatch = !bRemove = so 
bRemove = !bMatch .-)
 return !bMatch;
 }
-catch(css::container::NoSuchElementException)
+catch(const css::container::NoSuchElementException )
 {
 return true;
 }
diff --git a/filter/source/flash/swfexporter.cxx 
b/filter/source/flash/swfexporter.cxx
index 80b7d69..18c6d8f 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -161,7 +161,7 @@ sal_Bool FlashExporter::exportAll( Reference XComponent  
xDoc, Reference XOut
 delete mpWriter;
 mpWriter = new Writer(

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

2011-12-11 Thread August Sodora

 vcl/inc/vcl/status.hxx   |   12 ---
 vcl/source/window/status.cxx |  155 ---
 2 files changed, 167 deletions(-)

New commits:
commit c95fa19f7c7b58a2beb65ad52335322ec2ae6f18
Author: August Sodora aug...@gmail.com
Date:   Sun Dec 11 21:01:03 2011 -0500

Remove unused code

diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx
index d039ddf..4fa982c 100644
--- a/vcl/inc/vcl/status.hxx
+++ b/vcl/inc/vcl/status.hxx
@@ -123,7 +123,6 @@ private:
 public:
 StatusBar( Window* pParent,
WinBits nWinStyle = WB_BORDER | WB_RIGHT );
-StatusBar( Window* pParent, const ResId rResId );
 ~StatusBar();
 
 virtual voidMouseButtonDown( const MouseEvent rMEvt );
@@ -144,15 +143,11 @@ public:
 sal_uInt16 nPos = STATUSBAR_APPEND );
 voidRemoveItem( sal_uInt16 nItemId );
 
-voidShowItem( sal_uInt16 nItemId );
 voidHideItem( sal_uInt16 nItemId );
 sal_BoolIsItemVisible( sal_uInt16 nItemId ) const;
 
-voidShowItems();
-voidHideItems();
 sal_BoolAreItemsVisible() const { return mbVisibleItems; }
 
-voidCopyItems( const StatusBar rStatusBar );
 voidClear();
 
 sal_uInt16  GetItemCount() const;
@@ -163,15 +158,12 @@ public:
 Point   GetItemTextPos( sal_uInt16 nItemId ) const;
 sal_uInt16  GetCurItemId() const { return mnCurItemId; }
 
-sal_uLong   GetItemWidth( sal_uInt16 nItemId ) const;
-StatusBarItemBits   GetItemBits( sal_uInt16 nItemId ) const;
 longGetItemOffset( sal_uInt16 nItemId ) const;
 
 voidSetItemText( sal_uInt16 nItemId, const XubString 
rText );
 const XubStringGetItemText( sal_uInt16 nItemId ) const;
 
 voidSetItemData( sal_uInt16 nItemId, void* pNewData );
-void*   GetItemData( sal_uInt16 nItemId ) const;
 
 voidSetItemCommand( sal_uInt16 nItemId, const XubString 
rCommand );
 const XubStringGetItemCommand( sal_uInt16 nItemId );
@@ -187,17 +179,13 @@ public:
 voidSetHelpId( sal_uInt16 nItemId, const rtl::OString 
rHelpId );
 rtl::OStringGetHelpId( sal_uInt16 nItemId ) const;
 
-voidSetBottomBorder( sal_Bool bBottomBorder = sal_True );
 sal_BoolIsBottomBorder() const { return mbBottomBorder; }
-
-voidSetTopBorder( sal_Bool bTopBorder = sal_True );
 sal_BoolIsTopBorder() const;
 
 voidStartProgressMode( const XubString rText );
 voidSetProgressValue( sal_uInt16 nPercent );
 voidEndProgressMode();
 sal_BoolIsProgressMode() const { return mbProgressMode; }
-voidResetProgressMode();
 
 voidSetText( const XubString rText );
 
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 944ad5f..32dcc4a 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -176,20 +176,6 @@ StatusBar::StatusBar( Window* pParent, WinBits nStyle ) :
 
 // ---
 
-StatusBar::StatusBar( Window* pParent, const ResId rResId ) :
-Window( WINDOW_STATUSBAR )
-{
-rResId.SetRT( RSC_STATUSBAR );
-WinBits nStyle = ImplInitRes( rResId );
-ImplInit( pParent, nStyle );
-ImplLoadRes( rResId );
-
-if ( !(nStyle  WB_HIDE) )
-Show();
-}
-
-// ---
-
 StatusBar::~StatusBar()
 {
 // Alle Items loeschen
@@ -1050,28 +1036,6 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId )
 
 // ---
 
-void StatusBar::ShowItem( sal_uInt16 nItemId )
-{
-sal_uInt16 nPos = GetItemPos( nItemId );
-
-if ( nPos != STATUSBAR_ITEM_NOTFOUND )
-{
-ImplStatusItem* pItem = (*mpItemList)[ nPos ];
-if ( !pItem-mbVisible )
-{
-pItem-mbVisible = sal_True;
-
-mbFormat = sal_True;
-if ( ImplIsItemUpdate() )
-Invalidate();
-
-ImplCallEventListeners( VCLEVENT_STATUSBAR_SHOWITEM, (void*) 
sal_IntPtr(nItemId) );
-}
-}
-}
-
-// ---
-
 void StatusBar::HideItem( sal_uInt16 nItemId )
 {
 sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1106,54 +1070,6 @@ sal_Bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) 
const
 
 // ---
 
-void StatusBar::ShowItems()
-{
-if ( !mbVisibleItems )
-{
-

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

2011-12-11 Thread August Sodora

 vcl/inc/vcl/status.hxx   |2 --
 vcl/source/window/status.cxx |   22 --
 2 files changed, 24 deletions(-)

New commits:
commit 5008540c40484467e857c3245ae29c17c29673a2
Author: August Sodora aug...@gmail.com
Date:   Sun Dec 11 21:06:38 2011 -0500

Remove unused code

diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx
index 4fa982c..56cf7c7 100644
--- a/vcl/inc/vcl/status.hxx
+++ b/vcl/inc/vcl/status.hxx
@@ -143,9 +143,7 @@ public:
 sal_uInt16 nPos = STATUSBAR_APPEND );
 voidRemoveItem( sal_uInt16 nItemId );
 
-voidHideItem( sal_uInt16 nItemId );
 sal_BoolIsItemVisible( sal_uInt16 nItemId ) const;
-
 sal_BoolAreItemsVisible() const { return mbVisibleItems; }
 
 voidClear();
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 32dcc4a..b701697 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1036,28 +1036,6 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId )
 
 // ---
 
-void StatusBar::HideItem( sal_uInt16 nItemId )
-{
-sal_uInt16 nPos = GetItemPos( nItemId );
-
-if ( nPos != STATUSBAR_ITEM_NOTFOUND )
-{
-ImplStatusItem* pItem = (*mpItemList)[ nPos ];
-if ( pItem-mbVisible )
-{
-pItem-mbVisible = sal_False;
-
-mbFormat = sal_True;
-if ( ImplIsItemUpdate() )
-Invalidate();
-
-ImplCallEventListeners( VCLEVENT_STATUSBAR_HIDEITEM, (void*) 
sal_IntPtr(nItemId) );
-}
-}
-}
-
-// ---
-
 sal_Bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const
 {
 sal_uInt16 nPos = GetItemPos( nItemId );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/gbuild.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0ba066d4c84cf6ddc3b65ce6549ec25404f0d84
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 03:13:43 2011 +0100

Fix a typo?

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 256261c..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 solenv/gbuild/gbuild.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 557bf7ae88901b0be44a6b5c139842bead3c3461
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 03:13:43 2011 +0100

Fix a typo?

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 256261c..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in connectivity/source

 configure.in   |6 +++-
 connectivity/source/drivers/postgresql/makefile.mk |   28 +
 2 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit d1a1585c30c31dec38d32571e9c2bbee4d03
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 04:51:49 2011 +0100

Some more postgresql fixes

1. The --enable-extension-integration affects only packaging
2. OUTDIR_FOR_BUILD is for native build in case of crosscompiling

diff --git a/configure.in b/configure.in
index 26e2fd8..59cb7fb 100644
--- a/configure.in
+++ b/configure.in
@@ -5432,8 +5432,10 @@ dnl 
===
 dnl Check for PostgreSQL stuff
 dnl ===
 
-if test x$enable_ext_postgresql_sdbc = xyes -a 
x$enable_extension_integration != xno; then
-SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
+if test x$enable_ext_postgresql_sdbc = xyes; then
+if test x$enable_extension_integration = xyes; then
+  SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
+fi
 
 AC_MSG_CHECKING([PostgreSQL C interface])
 if test $with_system_postgresql = yes; then
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 91184d8..29f2029 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -77,6 +77,18 @@ PQ_SDBC_MINOR=8
 PQ_SDBC_MICRO=2
 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO)
 
+.IF $(SYSTEM_POSTGRESQL)==YES
+LIBPQ_LINK=-lpq
+.ELSE #SYSTEM_POSTGRESQL==NO
+.IF $(GUI)$(COM)==WNTMSC
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib 
shell32.lib
+.ELSE
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
+.ENDIF
+POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
+POSTGRESQL_LIB=
+.ENDIF
+
 CFLAGS+=$(POSTGRESQL_INC) \
 -DPQ_SDBC_MAJOR=$(PQ_SDBC_MAJOR) \
 -DPQ_SDBC_MINOR=$(PQ_SDBC_MINOR) \
@@ -97,22 +109,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=  $(SHL1TARGET)
 SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 
-# use the static version on Windows?
-# LEM 17/11/2011: removed everything except libpq proper;
-#  as per instructions in libpq documentation.
-#  If it turns out the rest was needed, reenable it.
-.IF $(SYSTEM_POSTGRESQL)==YES
-LIBPQ_LINK=-lpq
-.ELSE #SYSTEM_POSTGRESQL==NO
-.IF $(GUI)$(COM)==WNTMSC
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib 
advapi32.lib shell32.lib
-.ELSE
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
-.ENDIF
-POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
-POSTGRESQL_LIB=
-.ENDIF
-
 SHL2TARGET=postgresql-sdbc-impl.uno
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
 LIB2OBJFILES= \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 configure.in   |6 +++-
 connectivity/source/drivers/postgresql/makefile.mk |   28 +
 2 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit 58b49d96ad2be04253c3aa7b76144322bb5439ce
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 04:51:49 2011 +0100

Some more postgresql fixes

1. The --enable-extension-integration affects only packaging
2. OUTDIR_FOR_BUILD is for native build in case of crosscompiling

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/configure.in b/configure.in
index 44bb5e9..39c533d 100644
--- a/configure.in
+++ b/configure.in
@@ -5389,8 +5389,10 @@ dnl 
===
 dnl Check for PostgreSQL stuff
 dnl ===
 
-if test x$enable_ext_postgresql_sdbc = xyes -a 
x$enable_extension_integration != xno; then
-SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
+if test x$enable_ext_postgresql_sdbc = xyes; then
+if test x$enable_extension_integration = xyes; then
+  SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
+fi
 
 AC_MSG_CHECKING([PostgreSQL C interface])
 if test $with_system_postgresql = yes; then
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 91184d8..29f2029 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -77,6 +77,18 @@ PQ_SDBC_MINOR=8
 PQ_SDBC_MICRO=2
 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO)
 
+.IF $(SYSTEM_POSTGRESQL)==YES
+LIBPQ_LINK=-lpq
+.ELSE #SYSTEM_POSTGRESQL==NO
+.IF $(GUI)$(COM)==WNTMSC
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib 
shell32.lib
+.ELSE
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
+.ENDIF
+POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
+POSTGRESQL_LIB=
+.ENDIF
+
 CFLAGS+=$(POSTGRESQL_INC) \
 -DPQ_SDBC_MAJOR=$(PQ_SDBC_MAJOR) \
 -DPQ_SDBC_MINOR=$(PQ_SDBC_MINOR) \
@@ -97,22 +109,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=  $(SHL1TARGET)
 SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 
-# use the static version on Windows?
-# LEM 17/11/2011: removed everything except libpq proper;
-#  as per instructions in libpq documentation.
-#  If it turns out the rest was needed, reenable it.
-.IF $(SYSTEM_POSTGRESQL)==YES
-LIBPQ_LINK=-lpq
-.ELSE #SYSTEM_POSTGRESQL==NO
-.IF $(GUI)$(COM)==WNTMSC
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib 
advapi32.lib shell32.lib
-.ELSE
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
-.ENDIF
-POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
-POSTGRESQL_LIB=
-.ENDIF
-
 SHL2TARGET=postgresql-sdbc-impl.uno
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
 LIB2OBJFILES= \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice] random build failures in sfx2/sdi/sfxitems.sdi

2011-12-11 Thread lio...@mamane.lu

Hi,

Just to make sure someone that knows that part of the code gets a
notice (rather than only unrelated people):

There seems to be a failure in sfx2/sdi/sfxitems.sdi
(see attachment and
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=1323593401.28011#err677
)
which is unrelated to the commits since last success, so maybe a race
condition in a parallel build or something like that?

BTW, it took about 20 minutes for the full log to arrive at
http://tinderbox.libreoffice.org/MASTER/status.html; any reason for
such a significant delay?

-- 
Lionel
---BeginMessage---
Hi folks,

One of you broke the build of LibreOffice with your commit :-(
Please commit and push a fix ASAP!

Full log available at http://tinderbox.libreoffice.org/MASTER/status.html

Tinderbox info:

  Box name: Linux-x86-64@8-SLED11
  Machine: Linux ben 2.6.32.12-0.7-default #1 SMP 2010-05-20 11:14:20 +0200 
x86_64 x86_64 x86_64 GNU/Linux
  Configured with: CC=ccache gcc
CXX=ccache g++
--with-num-cpus=4
--with-max-jobs=15
--without-junit
--disable-dependency-tracking
--enable-binfilter

Commits since the last success:

 core 
  95a0d27  typo, trailing whitespace cleanup
  fc0f061  minor around python and SDK
 binfilter 
 dictionaries 
 help 

The error is:

build failed - error is:: log for /local/home/tinderbox/master/sfx2/prj
[ info  ALL ] LinkTarget Library/libxml2.so not defined: Assuming headers to be 
there!
[ build DEP ] SRS:sfx/res
[ build SDI ] sfx2/sdi/sfxslots

/local/home/tinderbox/master/sfx2/sdi/sfxitems.sdi --- error: ( 86, 11 )
may be no value for identifier   at ( 86, 11 )

/local/home/tinderbox/master/sfx2/sdi/sfxitems.sdi --- error: ( 86, 11 )
may be unknown type at ( 86, 11 )

/local/home/tinderbox/master/sfx2/sdi/sfxslots.sdi --- error: ( 38, 5 )
svidl terminated with errors
[ build PKG ] sfx2_inc
[ build PKG ] sfx2_sdi
make[2]: *** No rule to make target 
`/local/home/tinderbox/master/workdir/unxlngx6.pro/SdiTarget/sfx2/sdi/sfxslots',
 needed by 
`/local/home/tinderbox/master/workdir/unxlngx6.pro/Headers/Library/libsfxlo.so'.
  Stop.
make[2]: *** Waiting for unfinished jobs
dmake:  Error code 2, while making 'all'
==
ERROR: error 65280 occurred while making /local/home/tinderbox/master/sfx2/prj

---End Message---
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] SDK example cherry pick ?

On Sun, Dec 11, 2011 at 09:33:15AM +0100, Laurent Godard wrote:

 do you think it would be possible to cherry-pick these SDK example
 commits to 3.5. I see no potential negative impact

As a general idea, it looks good, but personally I miss the background
to evaluate the CSS bits, so I'll leave the cherry-pick to someone
else.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PARTIAL-PUSHED] [PATCH] configure.in examples: options shouldn't have quote

2011-12-11 Thread Korrawit Pruegsanusak

Hello Lionel,

On Sun, Dec 11, 2011 at 14:28, Lionel Elie Mamane lio...@mamane.lu wrote:
 Well, IMHO the example is correct _with_ quotation marks, else the
 shell will cut it into several arguments.
 [cut]
 On which platform have you encountered the it breaks with quotation
 marks, but works without quotation marks behaviour you mention?

Aha! Now I know why it fails on me.
If I run
  $ ./autogen.sh --with-some-arguments-here
it should be _with_ quote.

But if I edit autogen.lastrun and just run
  $ ./autogen.sh
without any argument, it will read from autogen.lastrun, and it should
be _without_ quote.

I'm on cygwin, but I think this applies to other platform as well ...

 Second patch is just a trivial change: --with-theme is without s.

 Yes, applied this one. Thanks!

Thanks!

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Does merge modules necessary only for msi installer?

2011-12-11 Thread Korrawit Pruegsanusak

Hello Fridrich, all,

On Sun, Dec 11, 2011 at 12:54, Fridrich Strba
fridrich.st...@graduateinstitute.ch wrote:
 No, not needed to check anything. If you have a compiler, you have them.
 They are part of the compiler installation.

Thanks, I check my installation and I just didn't install the merge module.
Sorry for the noise anyway.

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Commits in connectivity/inc connectivity/source dbaccess/source

On Sun, Oct 30, 2011 at 06:21:52PM +, Alex Thurgood wrote:

 The stuff you just committed looks interesting,

Thanks :)

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PARTIAL-PUSHED] [PATCH] configure.in examples: options shouldn't have quote

On Sun, Dec 11, 2011 at 05:18:36PM +0700, Korrawit Pruegsanusak wrote:
 On Sun, Dec 11, 2011 at 14:28, Lionel Elie Mamane lio...@mamane.lu wrote:

 Well, IMHO the example is correct _with_ quotation marks, else the
 shell will cut it into several arguments.
 [cut]
 On which platform have you encountered the it breaks with quotation
 marks, but works without quotation marks behaviour you mention?

 If I run
   $ ./autogen.sh --with-some-arguments-here
 it should be _with_ quote.

 But if I edit autogen.lastrun and just run
   $ ./autogen.sh
 without any argument, it will read from autogen.lastrun, and it should
 be _without_ quote.

Yes, this smells right, for all platforms.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call

On Sat, Dec 10, 2011 at 11:05:02AM +0100, Alexander Thurgood wrote:
 Le 09/12/11 23:10, Thorsten Behrens a écrit :

 And with attached patch, also a plain --enable-ext-postgresql-sdbc
 builds - Norbert, want to double-check  commit?

 So I built yesterday using :

 --with-ext-postgresql-sdbc
 --with-system-postgresql

 If I install this connector.oxt on another machine with MacOSX and a
 running pg instance, when I try to connect I get the following error :

 A driver is not registered for the URL
 sdbc:posgresql:dbhost=localhost dbname=demo

I got a similar error on my Debian GNU/Linux, solved by:

cd /libo/build/tree
rm -r solver/INPATH/installation/opt/share/extensions/postgresql-sdbc/ 
solver/INPATH/inc/postgresql/ solver/INPATH/lib/libpq.* 
connectivity/INPATH/lib/postgresql-sdbc*.{so,dylib,dll}
#build  deliver in connectivity
#forcefully install newly generated .oxt file
cd ~/.config/libreoffice/3/user/extensions/*/extensions.db

Replace INPATH by its value on your platform (something like
unxmaci); ~/.config/libreoffice/ is LibreOffice's user profile
directory on Unix, I'm not sure what it is on MacOS X.


Basically, the --with-system-postgresql build was still linking
statically against the libpq.a in the solver, so essentially was
behaving as a --without-system-postgresql :-| Which suggests
--without-system-postgresql is broken, need to check that out.

 Does your patch fix this problem of portability, i.e. from build
 machine to user machine ?

I don't think so, we need to work on that. In the current situation,
*maybe* if the user machine also install libpq (postgresql C client
library) at the _same_ location than on the build machine, it might
work, I'm not even sure of that. Given the multiplicity of ways to
install libpq on MacOS X, we don't want to require that, but I'm not
sure how to fix that cleanly. I'm waiting for a LibO/MacOS X dev to
chip in on that.

 I'm just trying to suss out the implications for me as the provider
 of the db connector extensions.

For MacOS X, we are still in the getting it to work stage.. We need
your testing for that, thanks for sticking around.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Question about VersionInfo resource of Windows executables

2011-12-11 Thread Andras Timar

Hi,

I was hacking on VersionInfo resource of Windows executables and I
noticed that DLLs built with dmake always have this resource, they
include solenv/inc/shlinfo.rc. But DLLs built with gmake does not have
VersionInfo resource by default. Is this normal? Executables are fully
functional without VersionInfo resource, but I think it is useful to
have it, because it contains file version, copyright notice etc. I
would like to ask, if it is by design, or if it is an undesired
omission.

Before I pushed my patch (3fbedc3e8f65c91999dcee42daa8312e387dcf40) I
build from scratch with MSVC successfully. However, I learned a few
hours later that I broke MinGW build.
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERbrief-log=1323606001.25653#21811
I found it strange, because 1) I didn't see any problems at line 38 in
shlinfo.rc; 2) under MSVC no resource was built for ucbhelper. I think
this is related to the general question I asked above.

Could you please check this. Eventually I wanted to cherry-pick
3fbedc3e8f65c91999dcee42daa8312e387dcf40 to libreoffice-3-5, because
it improves VersionInfo a lot (especially regarding branding and file
version data).

Thanks,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call

On Sun, Dec 11, 2011 at 03:09:41PM +0100, Lionel Elie Mamane wrote:

 Which suggests --without-system-postgresql is broken, need to check
 that out.

Works, at least on Debian GNU/Linux.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] End of the line for 3.3 family and regressions

2011-12-11 Thread Tommy


On Fri, 09 Dec 2011 21:34:34 +0100, Pedro Lino pedl...@gmail.com wrote:




I think this carries (from a QA point of vue) a much heavier
responsibility and care than the change from 3.4.4 to 3.5.0 (which is
experimental)

The planned release date for 3.4.5 is on January 11, 2012 and
apparently there won't be any Beta releases, it will jump directly to
RC1.

I urge everybody to make sure that EVERY regression detected from
3.3.x to 3.4.x is fixed/added to the 3.4 branch




+1.

LibO 3.4.5 will be the last release of the 3.4.x branch
since there will be no 3.4.6, the bugfixing should be handled with care
maybe a 2 more testing weeks before release (planned date jan 11) would  
help


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Do we support classic and industrial theme? (was: [PATCH] configure.in examples: options shouldn't have quote)

2011-12-11 Thread Korrawit Pruegsanusak

Hello all,

/me separate this into new thread. :)

On Sun, Dec 11, 2011 at 11:47, Korrawit Pruegsanusak
detective.conan.1...@gmail.com wrote:
 Last but not least, I've noticed that there are two themes, classic
 and industrial, that described in AS_HELP_STRING (see context in first
 patch) but not detected while checking (see context in second patch).
 That is, if user pass e.g. --with-theme=classic, it'll fail. So, do we
 really support classic and industrial themes? I've found them listed
 on ooo_custom_images [1], but I'm not sure if it's relevant.

 [1] http://opengrok.libreoffice.org/xref/core/ooo_custom_images/

I've tried to build [2] on cygwin regarding this, adding classic and
industrial into configure.in [3], and result as follows:

--with-theme=classic industrial - no icons at all, no checkboxes, no
theme names in Tools  Options  View  Icon size and style (has
only Automatic). Anyway, overall is somewhat usable, but looks very
ugly.

--with-theme=default classic industrial - it opens with default
theme, overall was as expected, but has only Galaxy (default) in
theme option.

--with-theme=default hicontrast oxygen classic industrial - like
second one, three theme options, and also none of classic nor
industrial.

Maybe a clean build needed? I'm on cygwin, so I wouldn't like `make
clean` much ;)
or maybe configure options related? (I don't think so)

[2] incremental build after success build at
faa285f2679c842b641ca721141218d826bf7ab7 (Dec 2, 2011)
[3] diff as follows:
diff --git a/configure.in b/configure.in
index f8aed0e..132e022 100644
--- a/configure.in
+++ b/configure.in
@@ -8034,7 +8034,7 @@ fi
 WITH_THEMES=
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango) : ;;
+default|crystal|hicontrast|oxygen|tango|classic|industrial) : ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES=$WITH_THEMES $theme


Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Do we support classic and industrial theme? (was: [PATCH] configure.in examples: options shouldn't have quote)

2011-12-11 Thread Tommy

On Sun, 11 Dec 2011 15:39:08 +0100, Korrawit Pruegsanusak  
detective.conan.1...@gmail.com wrote:



Hello all,

/me separate this into new thread. :)

On Sun, Dec 11, 2011 at 11:47, Korrawit Pruegsanusak
detective.conan.1...@gmail.com wrote:
 So, do we really support classic and industrial themes? I've found  
them listed

on ooo_custom_images [1], but I'm not sure if it's relevant.

[1] http://opengrok.libreoffice.org/xref/core/ooo_custom_images/


 [cut]


additional infos about this on the bugtracker:
https://bugs.freedesktop.org/show_bug.cgi?id=38175

basically, the Classic theme was removed in LibO 3.4.0
but you can manually enable it again downloading a 3.4.x compliant
theme ( images_classic.zip ) from the issue tracker and copying it the  
proper location:


\Bin\LibreOffice 3\Basis\share\config (in Windows, don't know if it's the  
same in Linux and Mac)


this works in 3.4.x but doesn't work on 3.5 master

my guess is that in LibO 3.4.x the devs just removed physically the
images_classic.zip file but the software still has some code somewhere  
pointing

towards that file.

indeed if you put a images_classic.zip file under 3.4.x you can enable the
classic theme.

however if you rename the images_classic.zip with something else (i.e.
images_dummy.zip) LibO 3.4.x fails to recognize that theme.

probably the code in 3.5.x has been cleaned and there's no place for the
classic theme yet, but just for the other themes (Tango, Galaxy etc. etc.)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Do we support classic and industrial theme? (was: [PATCH] configure.in examples: options shouldn't have quote)

2011-12-11 Thread Rainer Bielefeld


Tommy schrieb:


probably the code in 3.5.x has been cleaned and there's no place for the
classic theme yet, but just for the other themes (Tango, Galaxy etc. etc.)


Hi,

And what's your theory concerning the fact that (at least) tango theme 
copied from 3.4 to master will not work, too?


CU


Rainer

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] random build failures in sfx2/sdi/sfxitems.sdi

2011-12-11 Thread Christian Lohmaier

Hi Lionel, *,

On Sun, Dec 11, 2011 at 10:58 AM, lio...@mamane.lu lio...@mamane.lu wrote:

 There seems to be a failure in sfx2/sdi/sfxitems.sdi
 (see attachment and
 http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=1323593401.28011#err677

Any reason why you are using the huge full-log instead of the brief log?
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERbrief-log=1323593401.28011#err677

 BTW, it took about 20 minutes for the full log to arrive at
 http://tinderbox.libreoffice.org/MASTER/status.html; any reason for
 such a significant delay?

The cronjob that regenerates the page is only run every 15 minutes or
so. I don't consider it a significant delay when a build takes 2½-3
hours...

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] random build failures in sfx2/sdi/sfxitems.sdi

2011-12-11 Thread lio...@mamane.lu

On Sun, Dec 11, 2011 at 05:48:54PM +0100, Christian Lohmaier wrote:
On Sun, Dec 11, 2011 at 10:58 AM, lio...@mamane.lu lio...@mamane.lu wrote:

There seems to be a failure in sfx2/sdi/sfxitems.sdi
(see attachment and
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERfull-log=1323593401.28011#err677

Any reason why you are using the huge full-log instead of the brief log?
http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERbrief-log=1323593401.28011#err677

I thought the brief log was the same as the contents of the email to
committers and I couldn't make sense of that. That's why I went to
http://tinderbox.l.o in the first place.

BTW, it took about 20 minutes for the full log to arrive at
http://tinderbox.libreoffice.org/MASTER/status.html; any reason for
such a significant delay?

The cronjob that regenerates the page

Ah, it is a cronjob, I see.

is only run every 15 minutes or so. I don't consider it a
significant delay when a build takes 2½-3 hours...

From the POV of a committer that gets the you broke the build mail
and would like to investigate it, it can feel long (it did for me).

Besides, a build takes 2.5-3 hours is not true:

Linux-Gentoo-x86_64_2-no-moz_no-binfilter had several successful
builds in 17-18 minutes.

MacOSX-Intel_1-built_no-moz_on_10.6.8: several at 18-19 minutes, but
then an outlier at 105 minutes.

In general *failed* builds can be _much_ shorter than successful
builds if the error is early... And failed builds is the logs you want
to see :) The tinderbox I was interested in (Linux-x86-64_8-SLED11)
has a rather high variability in build time:

25, 33, 145, 41, 32, 37, 26, 154, 183, 96, 88, 100, 45, 102, 22, 137, ...

--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call

On Sat, Dec 10, 2011 at 01:53:20AM +0200, Tor Lillqvist wrote:
 Stephan Bergmann sberg...@redhat.com wrote:

  libpq.5.dylib (compatibility version 5.0.0, current version 5.3.0)

 That way it won't be found at runtime.  If it is a lib from the
 system, it should have an absolute path (like the ones below), if
 it is part of LO it should be referenced relatively via
 @loader_path (like the ones above).

 Well, as a system lib I understand it can be installed nearly anywhere

 Er... huh? Isn't the very definition of a system library one that is
 installed in a fixed known location, as part of the operating
 system?

With that definition of a system library, libpq is neither a lib
from the system, nor part of LO.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Do we support classic and industrial theme? (was: [PATCH] configure.in examples: options shouldn't have quote)

2011-12-11 Thread Tommy

On Sun, 11 Dec 2011 17:41:22 +0100, Rainer Bielefeld  
libreoff...@bielefeldundbuss.de wrote:



Tommy schrieb:


probably the code in 3.5.x has been cleaned and there's no place for the
classic theme yet, but just for the other themes (Tango, Galaxy etc.  
etc.)


Hi,

And what's your theory concerning the fact that (at least) tango theme  
copied from 3.4 to master will not work, too?


CU


Rainer




Hi Reiner,
as far as I know, LibO 3.3.x had 6 available themes:

Galaxy, Tango, Crystal, Hi-Contrast, Oxygen, Classic

the themes were extensively reworked in 3.4.x in order to get rid of  
duplicate icons.
during this process the devs decided to remove the Classic theme, leaving  
the other 5:

Galaxy, Tango, Crystal, Hi-Contrast, Oxygen

as I told before something in the code about the Classic theme remained  
somewhere and allowed us to re-introduce the Classic after reformatting it  
to be compatible with 3.4.x.
Indeed if you use the zipped file from the 3.3.x release you will suffer  
inconsistencies


regarding 3.5 master I'm sorry I can't help... I have never installed that  
release...
so please, try to better explain what's the issue about the Tango theme  
from 3.4.x ...


isn't the Tango theme already available in 3.5 master?
did the devs remove it in master as they did in 3.4.x with Classic?
have the existing icon themes been reworked again in 3.5?

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call


On 09/12/11 23:10, Thorsten Behrens wrote:

And with attached patch, also a plain --enable-ext-postgresql-sdbc
builds - Norbert, want to double-check  commit?


Sorry, I added that all-static-lib to the target unconditionally, since 
that is not harming anything. I did not read this e-mail. I would 
otherwise give you the credits for it.


Cheers

F.


--
Please avoid sending me Word, Excel or PowerPoint attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call