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

2012-01-28 Thread Ivan Timofeev
 sc/source/ui/vba/vbachart.cxx |   33 -
 sc/source/ui/vba/vbachart.hxx |1 -
 unusedcode.easy   |1 -
 3 files changed, 35 deletions(-)

New commits:
commit 2b507836fc88f294ef55652174b66dc706125599
Author: Santiago Martinez 
Date:   Fri Jan 27 21:45:33 2012 +0100

Remove unused code as listed in unusedcode.easy

diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 94d2900..db9d23e 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -1028,39 +1028,6 @@ ScVbaChart::assignDiagramAttributes()
 xTwoAxisYSupplier.set( mxDiagramPropertySet, uno::UNO_QUERY_THROW );
 }
 
-bool
-ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw( 
script::BasicErrorException )
-{
-bool bret = false;
-try
-{
-uno::Reference< chart::XChartDataArray > xChartDataArray( 
mxChartDocument->getData(), uno::UNO_QUERY_THROW );
-//TODO I guess we have to differentiate between XlRowCol
-if ( !xChartDataArray.is() )
-{
-if (getPlotBy() == xlRows)
-{
-if ((_seriesindex < 
xChartDataArray->getRowDescriptions().getLength() ) && (_seriesindex >= 0))
-bret = true;
-}
-else
-{
-if ((_seriesindex < 
xChartDataArray->getColumnDescriptions().getLength() ) && (_seriesindex >= 0))
-bret = true;
-}
-}
-}
-catch (const uno::Exception&)
-{
-throw script::BasicErrorException( rtl::OUString(), uno::Reference< 
uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
-}
-if (!bret)
-{
-throw script::BasicErrorException( rtl::OUString(), uno::Reference< 
uno::XInterface >(), SbERR_OUT_OF_RANGE, rtl::OUString() );
-}
-return bret;
-}
-
 
 uno::Reference< beans::XPropertySet >
 ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) 
throw ( script::BasicErrorException )
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index 104cc55..e984ecf 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -74,7 +74,6 @@ public:
 
 // Non-interface
 css::uno::Reference< css::beans::XPropertySet > xDiagramPropertySet() 
const { return mxDiagramPropertySet; }
-bool isSeriesIndexValid(sal_Int32 _seriesindex) throw( 
css::script::BasicErrorException );
 bool is3D() throw ( css::uno::RuntimeException );
 css::uno::Reference< css::beans::XPropertySet > 
getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( 
css::script::BasicErrorException );
 // Methods
diff --git a/unusedcode.easy b/unusedcode.easy
index 7b9b2c4..15b998c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -215,7 +215,6 @@ ScValidationEntries_Impl::Insert(ScValidationEntries_Impl 
const*, unsigned short
 ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
 ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
 ScValueCell::ScValueCell()
-ScVbaChart::isSeriesIndexValid(int)
 ScVbaColorFormat::setColorFormat(short)
 
ScVbaCommandBarControl::ScVbaCommandBarControl(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference 
const&, com::sun::star::uno::Reference 
const&, boost::shared_ptr, 
com::sun::star::uno::Reference const&, 
rtl::OUString const&, int, unsigned char)
 
ScVbaCommentShape::ScVbaCommentShape(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference 
const&, com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, int)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/android' - 2 commits - desktop/source vcl/android vcl/headless vcl/inc vcl/source

2012-01-28 Thread Michael Meeks
 desktop/source/app/app.cxx|   37 ++
 vcl/android/androidinst.cxx   |  240 --
 vcl/headless/svpframe.cxx |3 
 vcl/headless/svpinst.cxx  |2 
 vcl/inc/headless/svpframe.hxx |3 
 vcl/source/app/svmain.cxx |5 
 6 files changed, 97 insertions(+), 193 deletions(-)

New commits:
commit a6e06bdbd3d22ce995c2bc8e4d2dd82a3854f1c4
Author: Michael Meeks 
Date:   Sat Jan 28 00:03:11 2012 +

android: add debug hooks through app.cxx, comment chunks and add a dialog

without the dialog, the main window never appears to get shown.

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 91c7531..6101827 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,6 +102,8 @@
 #include 
 #endif
 
+extern void VCL_DLLPUBLIC plasma_now(const char *msg);
+
 #define DEFINE_CONST_UNICODE(CONSTASCII)
UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
 #define U2S(STRING)
::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
 
@@ -1503,12 +1505,16 @@ int Desktop::Main()
 
 ResMgr::SetReadStringHook( ReplaceStringHookProc );
 
+//::plasma_now("after desktoppy bits"); - fine to here ...
+
 // Startup screen
 RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main { 
OpenSplashScreen" );
 OpenSplashScreen();
 RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main } 
OpenSplashScreen" );
 
 SetSplashScreenProgress(10);
+
+//::plasma_now("after splash open");
 {
 UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
 if ( instErr_fin != UserInstall::E_None)
@@ -1536,6 +1542,8 @@ int Desktop::Main()
 {
 RegisterServices( xSMgr );
 
+//::plasma_now("registered services");
+
 SetSplashScreenProgress(25);
 
 #ifndef UNX
@@ -1580,6 +1588,8 @@ int Desktop::Main()
 if ( !InitializeConfiguration() )
 return EXIT_FAILURE;
 
+//::plasma_now("init configuration");
+
 SetSplashScreenProgress(30);
 
 // set static variable to enabled/disable crash reporter
@@ -1597,6 +1607,8 @@ int Desktop::Main()
 String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, 
*pLabelResMgr ) ) : String();
 delete pLabelResMgr;
 
+//::plasma_now("after title string");
+
 #ifdef DBG_UTIL
 //include version ID in non product builds
 ::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
@@ -1613,6 +1625,8 @@ int Desktop::Main()
 SetSplashScreenProgress(40);
 RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and 
SvtLanguageOptions" );
 
+//::plasma_now("unrestricted folders"); -- got this.
+
 // Check special env variable
 std::vector< String > aUnrestrictedFolders;
 svt::getUnrestrictedFolders( aUnrestrictedFolders );
@@ -1633,6 +1647,8 @@ int Desktop::Main()
 ( xSMgr->createInstance(
 DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" 
) ), UNO_QUERY );
 
+::plasma_now("done global event broadcaster");
+
 /* ensure existance of a default window that messages can be 
dispatched to
This is for the benefit of testtool which uses PostUserEvent 
extensively
and else can deadlock while creating this window from another tread 
while
@@ -1640,6 +1656,7 @@ int Desktop::Main()
 */
 Application::GetDefaultDevice();
 
+#ifndef ANDROID
 // Check if bundled or shared extensions were added /removed
 // and process those extensions (has to be done before checking
 // the extension dependencies!
@@ -1657,6 +1674,7 @@ int Desktop::Main()
 pExecGlobals->bRestartRequested = ( xRestartManager.is() && 
xRestartManager->isRestartRequested( sal_True ) );
 
 Migration::migrateSettingsIfNecessary();
+#endif
 
 // keep a language options instance...
 pExecGlobals->pLanguageOptions.reset( new 
SvtLanguageOptions(sal_True));
@@ -1668,6 +1686,8 @@ int Desktop::Main()
 pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
 }
 
+::plasma_now("invoked OnStartupApp");
+
 SetSplashScreenProgress(50);
 
 // Backing Component
@@ -1697,6 +1717,8 @@ int Desktop::Main()
 aMiscOptions.SetUseSystemFileDialog( sal_False );
 }
 
+::plasma_now("nearly there !");
+
 if ( !pExecGlobals->bRestartRequested )
 {
 if ((!rCmdLineArgs.WantsToLoadDocument() && 
!rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsHeadless() && 
!rCmdLineArgs.IsQuickstart()) &&
@@ -1766,6 +1788,8 @@ int Desktop::Main()
 aOptions.SetVCLSettings();
 SetSplashScreenProgress(60);
 
+::plasma_now("setup appearance !");
+
 if ( !pExecGlobals->bRestartRequested )
 {
 Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
@@

[Libreoffice-commits] .: 9 commits - vcl/aqua vcl/headless vcl/inc vcl/ios vcl/Library_vclplug_gen.mk vcl/source vcl/unx vcl/win

2012-01-28 Thread Thomas Arnhold
 vcl/Library_vclplug_gen.mk   |1 
 vcl/aqua/source/window/salframe.cxx  |7 
 vcl/headless/svpframe.cxx|5 
 vcl/inc/aqua/salframe.h  |1 
 vcl/inc/brdwin.hxx   |1 
 vcl/inc/headless/svpframe.hxx|1 
 vcl/inc/ios/salframe.h   |3 
 vcl/inc/salframe.hxx |1 
 vcl/inc/unx/gtk/gtkframe.hxx |1 
 vcl/inc/unx/gtk/gtkgdi.hxx   |3 
 vcl/inc/unx/saldisp.hxx  |   36 ---
 vcl/inc/unx/salframe.h   |1 
 vcl/inc/vcl/keycod.hxx   |   17 -
 vcl/inc/vcl/msgbox.hxx   |1 
 vcl/inc/win/salframe.h   |1 
 vcl/ios/source/window/salframe.cxx   |7 
 vcl/source/window/brdwin.cxx |   10 -
 vcl/source/window/menu.cxx   |   30 ---
 vcl/source/window/msgbox.cxx |3 
 vcl/unx/generic/app/keysymnames.cxx  |  308 ---
 vcl/unx/generic/app/saldisp.cxx  |  148 --
 vcl/unx/generic/window/salframe.cxx  |5 
 vcl/unx/gtk/app/gtkdata.cxx  |   13 -
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   52 -
 vcl/unx/gtk/window/gtkframe.cxx  |   11 -
 vcl/win/source/window/salframe.cxx   |7 
 26 files changed, 9 insertions(+), 665 deletions(-)

New commits:
commit f356508623a258dd16037f86da6183b5875064c0
Author: Thomas Arnhold 
Date:   Sat Jan 28 00:29:54 2012 +0100

mbHelpBtn is always false

diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index d7e21d0..394503d 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -118,7 +118,6 @@ private:
 sal_BoolmbMenuHide;
 sal_BoolmbDockBtn;
 sal_BoolmbHideBtn;
-sal_BoolmbHelpBtn;
 sal_BoolmbMenuBtn;
 sal_BoolmbDisplayActive;
 
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 7e225ea..712c3b3 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1594,15 +1594,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, 
long nWidth, long nHeigh
 pData->maRollRect.Left()   = 
pData->maRollRect.Right()-pData->maRollRect.GetHeight()+1;
 nRight -= pData->maRollRect.GetWidth();
 }
-
-if ( pBorderWindow->mbHelpBtn )
-{
-pData->maHelpRect.Top()= nItemTop;
-pData->maHelpRect.Bottom() = nItemBottom;
-pData->maHelpRect.Right()  = nRight;
-pData->maHelpRect.Left()   = 
pData->maHelpRect.Right()-pData->maHelpRect.GetHeight()+1;
-nRight -= pData->maHelpRect.GetWidth()+3;
-}
 }
 else
 {
@@ -1922,7 +1913,6 @@ void ImplBorderWindow::ImplInit( Window* pParent,
 mbDockBtn   = sal_False;
 mbMenuBtn   = sal_False;
 mbHideBtn   = sal_False;
-mbHelpBtn   = sal_False;
 mbDisplayActive = IsActive();
 
 if ( nTypeStyle & BORDERWINDOW_STYLE_FLOAT )
commit 632e2826d02dce2977044815ee604485b29775c1
Author: Thomas Arnhold 
Date:   Sat Jan 28 00:24:33 2012 +0100

mbSound is always true

diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 6d6c920..30fae20 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -73,7 +73,6 @@ protected:
 Image   maImage;
 sal_uInt16  mnSoundType;
 sal_BoolmbHelpBtn;
-sal_BoolmbSound;
 CheckBox*   mpCheckBox;
 XubString   maCheckBoxText;
 sal_BoolmbCheck;
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 07610d6..5ffc6b0 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -71,7 +71,6 @@ void MessBox::ImplInitMessBoxData()
 mpFixedImage= NULL;
 mnSoundType = 0;
 mbHelpBtn   = sal_False;
-mbSound = sal_True;
 mpCheckBox  = NULL;
 mbCheck = sal_False;
 }
@@ -424,7 +423,7 @@ void MessBox::StateChanged( StateChangedType nType )
 if ( nType == STATE_CHANGE_INITSHOW )
 {
 ImplPosControls();
-if ( mbSound && mnSoundType )
+if ( mnSoundType )
 Sound::Beep( (SoundType)(mnSoundType-1), this );
 }
 ButtonDialog::StateChanged( nType );
commit 3c5dbb2f5405b495ec5fe257df839e955cccf622
Author: Thomas Arnhold 
Date:   Fri Jan 27 23:05:44 2012 +0100

remove some dead code

diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx
index cdde1fd..e0faa4a 100644
--- a/vcl/inc/vcl/keycod.hxx
+++ b/vcl/inc/vcl/keycod.hxx
@@ -39,23 +39,6 @@
 
 class Window;
 
-// -
-// - Key-Types -
-// -
-
-// Logische KeyFunktionen
-/*
-#ifndef ENUM_KEYFUNCTYPE_D

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

2012-01-28 Thread Michael Meeks
 basegfx/inc/basegfx/point/b2dhompoint.hxx |  239 ---
 basegfx/source/point/b2dhompoint.cxx  |  260 --
 unusedcode.easy   |9 -
 3 files changed, 508 deletions(-)

New commits:
commit aedea4de6cc93d1dc36e06e08b0bdf18b6700e1b
Author: Alexander Bergmann 
Date:   Sat Jan 28 10:06:32 2012 +0100

unusedcode.easy: Removed unused code (basegfx::B2DHomPoint)

diff --git a/basegfx/inc/basegfx/point/b2dhompoint.hxx 
b/basegfx/inc/basegfx/point/b2dhompoint.hxx
deleted file mode 100644
index 7f11827..000
--- a/basegfx/inc/basegfx/point/b2dhompoint.hxx
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _BGFX_POINT_B2DHOMPOINT_HXX
-#define _BGFX_POINT_B2DHOMPOINT_HXX
-
-#include 
-#include 
-
-namespace basegfx
-{
-/** Basic homogen Point class with two double values and one homogen factor
-
-This class provides access to homogen coordinates in 2D.
-For this purpose all the operators which need to do specific
-action due to their homogenity are implemented here.
-The only caveat are member methods which are declared as const
-but do change the content. These are documented for that reason.
-The class is designed to provide homogenous coordinates without
-direct access to the homogen part (mfW). This is also the reason
-for leaving out the [] operators which return references to members.
-
-@see B2DTuple
-*/
-class BASEGFX_DLLPUBLIC B2DHomPoint
-{
-protected:
-/// This member contains the coordinate part of the point
-::basegfx::B2DTuple maTuple;
-
-/// This Member holds the homogenous part of the point
-double  mfW;
-
-/** Test if this homogen point does have a homogenous part
-
-@return Returns true if this point has no homogenous part
-*/
-bool implIsHomogenized() const;
-
-/** Remove homogenous part of this Point
-
-This method does necessary calculations to remove
-the evtl. homogenous part of this Point. This may
-change all members.
-*/
-void implHomogenize();
-
-/** Test and on demand remove homogenous part
-
-This method tests if this Point does have a homogenous part
-and then evtl. takes actions to remove that part.
-
-@attention Even when this method is const it may change all
-members of this instance. This is due to the fact that changing
-the homogenous part of a homogenous point does from a mathematical
-point of view not change the point at all.
-*/
-void implTestAndHomogenize() const;
-
-public:
-/** Create a homogen point
-
-The point is initialized to (0.0, 0.0)
-*/
-B2DHomPoint()
-:   maTuple(),
-mfW(1.0)
-{}
-
-/** Create a homogen point
-
-@param fX
-This parameter is used to initialize the X-coordinate
-of the Point. The homogenous part is initialized to 1.0.
-
-@param fY
-This parameter is used to initialize the Y-coordinate
-of the Point. The homogenous part is initialized to 1.0.
-*/
-B2DHomPoint(double fX, double fY)
-:   maTuple(fX, fY),
-mfW(1.0)
-{}
-
-/** Create a copy of a 2D Point
-
-@param rVec
-The 2D point which will be copied. The homogenous part
-is initialized to 1.0.
-*/
-B2DHomPoint(const B2DPoint& rVec)
-:   maTuple(rVec),
-mfW(1.0)
-{

[Libreoffice-commits] .: vcl/inc

2012-01-28 Thread Thomas Arnhold
 vcl/inc/ios/salframe.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7205e0c3ee52a2e5259c8f4e53bba85ee6db6bb6
Author: Thomas Arnhold 
Date:   Sat Jan 28 11:11:17 2012 +0100

ios: fix mis-merge

diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h
index 68c4cbf..b76ddfd 100644
--- a/vcl/inc/ios/salframe.h
+++ b/vcl/inc/ios/salframe.h
@@ -139,7 +139,7 @@ public:
 virtual voidSync();
 virtual voidSetInputContext( SalInputContext* pContext );
 virtual voidEndExtTextInput( sal_uInt16 nFlags );
-virtual String  GetKeyName( sal_uInt16 nKeyCode );
+virtual rtl::OUString   GetKeyName( sal_uInt16 nKeyCode );
 virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode, 
LanguageType aLangType, KeyCode& rKeyCode );
 virtual LanguageTypeGetInputLanguage();
 virtual SalBitmap*  SnapShot();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: basegfx/Library_basegfx.mk basegfx/Package_inc.mk basegfx/StaticLibrary_basegfx_s.mk basegfx/test

2012-01-28 Thread Thomas Arnhold
 basegfx/Library_basegfx.mk |1 -
 basegfx/Package_inc.mk |1 -
 basegfx/StaticLibrary_basegfx_s.mk |1 -
 basegfx/test/basegfx2d.cxx |   28 
 4 files changed, 31 deletions(-)

New commits:
commit 57dacf1328e4cff53c108f627b3be2b3329f0e90
Author: Thomas Arnhold 
Date:   Sat Jan 28 11:22:52 2012 +0100

remove traces of b2dhompoint

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index fc6a479..e659f4e 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -113,7 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/point/b3ipoint \
basegfx/source/point/b2dpoint \
basegfx/source/point/b3dpoint \
-   basegfx/source/point/b2dhompoint \
basegfx/source/point/b2ipoint \
basegfx/source/curve/b2dbeziertools \
basegfx/source/curve/b2dcubicbezier \
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
index 13b5ff8..bf088b3 100644
--- a/basegfx/Package_inc.mk
+++ b/basegfx/Package_inc.mk
@@ -90,7 +90,6 @@ $(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrixtoo
 $(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3ipoint.hxx,basegfx/point/b3ipoint.hxx))
 $(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dpoint.hxx,basegfx/point/b3dpoint.hxx))
 $(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dpoint.hxx,basegfx/point/b2dpoint.hxx))
-$(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dhompoint.hxx,basegfx/point/b2dhompoint.hxx))
 $(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2ipoint.hxx,basegfx/point/b2ipoint.hxx))
 $(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dcubicbezier.hxx,basegfx/curve/b2dcubicbezier.hxx))
 $(eval $(call 
gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dbeziertools.hxx,basegfx/curve/b2dbeziertools.hxx))
diff --git a/basegfx/StaticLibrary_basegfx_s.mk 
b/basegfx/StaticLibrary_basegfx_s.mk
index 69616f7..e72a328 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -118,7 +118,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/point/b3ipoint \
CustomTarget/basegfx/source/point/b2dpoint \
CustomTarget/basegfx/source/point/b3dpoint \
-   CustomTarget/basegfx/source/point/b2dhompoint \
CustomTarget/basegfx/source/point/b2ipoint \
CustomTarget/basegfx/source/curve/b2dbeziertools \
CustomTarget/basegfx/source/curve/b2dcubicbezier \
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 0f0c9c7..d6e26a8 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -703,33 +703,6 @@ public:
 }; // class b2dhommatrix
 
 
-class b2dhompoint : public CppUnit::TestFixture
-{
-public:
-// initialise your test code values here.
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-
-// insert your test code here.
-void EmptyMethod()
-{
-}
-
-// Change the following lines only, if you add, remove or rename
-// member functions of the current class,
-// because these macros are need by auto register mechanism.
-
-SAL_CPPUNIT_TEST_SUITE(b2dhompoint);
-CPPUNIT_TEST(EmptyMethod);
-SAL_CPPUNIT_TEST_SUITE_END();
-}; // class b2dhompoint
-
-
 class b2dpoint : public CppUnit::TestFixture
 {
 public:
@@ -1390,7 +1363,6 @@ public:
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dsvgdimpex);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolyrange);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhommatrix);
-CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dhompoint);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpoint);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygon);
 CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolygontools);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: xmlscript/source

2012-01-28 Thread Olivier Hallot
 xmlscript/source/xmldlg_imexp/imp_share.hxx|6 +-
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx|   28 +--
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |   24 +-
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx|   50 ++---
 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx   |2 
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx   |8 +--
 xmlscript/source/xmllib_imexp/imp_share.hxx|6 +-
 xmlscript/source/xmllib_imexp/xmllib_export.cxx|2 
 xmlscript/source/xmllib_imexp/xmllib_import.cxx|2 
 xmlscript/source/xmlmod_imexp/xmlmod_export.cxx|2 
 10 files changed, 65 insertions(+), 65 deletions(-)

New commits:
commit 9d4e1a5dadede021922abcb00d346fe496240ab4
Author: Olivier Hallot 
Date:   Sat Jan 28 09:31:35 2012 -0200

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

Part LIV
Modules
xmlscript

diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx 
b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index b915a18..33556e0 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -68,7 +68,7 @@ inline bool getBoolAttr(
 sal_Int32 nUid )
 {
 ::rtl::OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) 
);
-if (aValue.getLength())
+if (!aValue.isEmpty())
 {
 if (aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("true") ))
 {
@@ -96,7 +96,7 @@ inline bool getStringAttr(
 sal_Int32 nUid )
 {
 *pRet = xAttributes->getValueByUidName( nUid, rAttrName );
-return (pRet->getLength() > 0);
+return (!pRet->isEmpty());
 }
 
 inline bool getLongAttr(
@@ -105,7 +105,7 @@ inline bool getLongAttr(
 sal_Int32 nUid )
 {
 ::rtl::OUString aValue( xAttributes->getValueByUidName( nUid, rAttrName ) 
);
-if (aValue.getLength())
+if (!aValue.isEmpty())
 {
 *pRet = toInt32( aValue );
 return true;
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index ece2ca8..b6b717a 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -587,11 +587,11 @@ void ElementDescriptor::addNumberFormatAttr(
 // format-locale
 OUStringBuffer buf( 48 );
 buf.append( locale.Language );
-if (locale.Country.getLength())
+if (!locale.Country.isEmpty())
 {
 buf.append( (sal_Unicode)';' );
 buf.append( locale.Country );
-if (locale.Variant.getLength())
+if (!locale.Variant.isEmpty())
 {
 buf.append( (sal_Unicode)';' );
 buf.append( locale.Variant );
@@ -794,7 +794,7 @@ void ElementDescriptor::readImageURLAttr( OUString const & 
rPropName, OUString c
 rtl::OUString sURL;
 _xProps->getPropertyValue( rPropName ) >>= sURL;
 
-if ( sURL.getLength() && sURL.compareToAscii( 
XMLSCRIPT_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( 
XMLSCRIPT_GRAPHOBJ_URLPREFIX ) ) == 0 )
+if ( !sURL.isEmpty() && sURL.compareToAscii( 
XMLSCRIPT_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( 
XMLSCRIPT_GRAPHOBJ_URLPREFIX ) ) == 0 )
 {
 Reference< document::XStorageBasedDocument > xDocStorage( 
_xDocument, UNO_QUERY );
 if ( xDocStorage.is() )
@@ -809,7 +809,7 @@ void ElementDescriptor::readImageURLAttr( OUString const & 
rPropName, OUString c
 sURL = xGraphicResolver->resolveGraphicObjectURL( sURL );
 }
 }
-if ( sURL.getLength() )
+if ( !sURL.isEmpty() )
 addAttribute( rAttrName, sURL );
 }
 }
@@ -998,7 +998,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const & 
rAttrName )
 xConvertor->setPropertyValue( OUSTR("Address"), makeAny( 
aAddress ) );
 rtl::OUString sAddress;
 xConvertor->getPropertyValue( 
OUSTR("PersistentRepresentation") ) >>= sAddress;
-if ( sAddress.getLength() > 0 )
+if ( !sAddress.isEmpty() )
 addAttribute( rAttrName, sAddress );
 
 OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( 
sAddress, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -1027,7 +1027,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const 
& rAttrName )
 xConvertor->getPropertyValue( 
OUSTR("PersistentRepresentation") ) >>= sAddress;
 OSL_TRACE(" cell range source list %s",
 rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 
).getStr() );
-if ( sAddress.getLength() > 0 )
+if ( !sAddress.isEmpty() )
 addAttribute( rAttrName, sAddress );
 }
 catch( uno::Exception& )
@@ -1091,7 +1091,7 @@ void ElementDescriptor::readDefaults( bool 
supportPrintable, bool supportVisible
 if ( xPersist.is() )
 {
 OUString sC

[Libreoffice-commits] .: xmlsecurity/source

2012-01-28 Thread Olivier Hallot
 xmlsecurity/source/component/documentdigitalsignatures.cxx |   22 ++---
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |6 +--
 xmlsecurity/source/dialogs/resourcemanager.cxx |   10 ++---
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |4 +-
 xmlsecurity/source/helper/xmlsignaturehelper2.cxx  |6 +--
 xmlsecurity/source/helper/xsecctl.cxx  |   10 ++---
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx   |4 +-
 7 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 7c4807bfc066772acf162546468afff6cd81a0d1
Author: Olivier Hallot 
Date:   Sat Jan 28 09:56:30 2012 -0200

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

Part LV
Modules
xmlsecurity

diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx 
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 8f70cdd..a55a874 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -98,7 +98,7 @@ void DocumentDigitalSignatures::initialize( const Sequence< 
Any >& aArguments)
 //the Version is supported as of ODF1.2, so for and 1.1 document or older 
we will receive the
 //an empty string. In this case we set it to ODFVER_010_TEXT. Then we can 
later check easily
 //if initialize was called. Only then m_sODFVersion.getLength() is greater 
than 0
-if (m_sODFVersion.getLength() == 0)
+if (m_sODFVersion.isEmpty())
 m_sODFVersion = ODFVER_010_TEXT;
 }
 
@@ -107,7 +107,7 @@ sal_Bool DocumentDigitalSignatures::signDocumentContent(
 const Reference< css::io::XStream >& xSignStream)
 throw (RuntimeException)
 {
-OSL_ENSURE(m_sODFVersion.getLength(), "DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
+OSL_ENSURE(!m_sODFVersion.isEmpty(), "DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
 return ImplViewSignatures( rxStorage, xSignStream, 
SignatureModeDocumentContent, false );
 }
 
@@ -116,7 +116,7 @@ DocumentDigitalSignatures::verifyDocumentContentSignatures(
 const Reference< css::embed::XStorage >& rxStorage,
 const Reference< css::io::XInputStream >& xSignInStream ) throw 
(RuntimeException)
 {
-OSL_ENSURE(m_sODFVersion.getLength(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
+OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
 return ImplVerifySignatures( rxStorage, xSignInStream, 
SignatureModeDocumentContent );
 }
 
@@ -124,7 +124,7 @@ void 
DocumentDigitalSignatures::showDocumentContentSignatures(
 const Reference< css::embed::XStorage >& rxStorage,
 const Reference< css::io::XInputStream >& xSignInStream ) throw 
(RuntimeException)
 {
-OSL_ENSURE(m_sODFVersion.getLength(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
+OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
 ImplViewSignatures( rxStorage, xSignInStream, 
SignatureModeDocumentContent, true );
 }
 
@@ -138,7 +138,7 @@ sal_Bool DocumentDigitalSignatures::signScriptingContent(
 const Reference< css::embed::XStorage >& rxStorage,
 const Reference< css::io::XStream >& xSignStream ) throw (RuntimeException)
 {
-OSL_ENSURE(m_sODFVersion.getLength(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
+OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
 OSL_ENSURE(m_nArgumentsCount == 2, "DocumentDigitalSignatures: Service was 
not initialized properly");
 return ImplViewSignatures( rxStorage, xSignStream, SignatureModeMacros, 
false );
 }
@@ -148,7 +148,7 @@ DocumentDigitalSignatures::verifyScriptingContentSignatures(
 const Reference< css::embed::XStorage >& rxStorage,
 const Reference< css::io::XInputStream >& xSignInStream ) throw 
(RuntimeException)
 {
-OSL_ENSURE(m_sODFVersion.getLength(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
+OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
 return ImplVerifySignatures( rxStorage, xSignInStream, SignatureModeMacros 
);
 }
 
@@ -156,7 +156,7 @@ void 
DocumentDigitalSignatures::showScriptingContentSignatures(
 const Reference< css::embed::XStorage >& rxStorage,
 const Reference< css::io::XInputStream >& xSignInStream ) throw 
(RuntimeException)
 {
-OSL_ENSURE(m_sODFVersion.getLength(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
+OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF 
Version not set, assuming minimum 1.2");
 ImplViewSignatures( rxStorage, xSignInStream, SignatureModeMacros, true );
 }
 
@@ -171,7 +171,7 @@ sal_Bool DocumentDigit

[Libreoffice-commits] .: vbahelper/source

2012-01-28 Thread Olivier Hallot
 vbahelper/source/msforms/vbacombobox.cxx   |4 ++--
 vbahelper/source/msforms/vbacontrols.cxx   |   12 ++--
 vbahelper/source/msforms/vbalistcontrolhelper.cxx  |2 +-
 vbahelper/source/msforms/vbauserform.cxx   |2 +-
 vbahelper/source/vbahelper/vbaapplicationbase.cxx  |4 ++--
 vbahelper/source/vbahelper/vbacommandbar.cxx   |2 +-
 vbahelper/source/vbahelper/vbacommandbarhelper.cxx |4 ++--
 vbahelper/source/vbahelper/vbacommandbars.cxx  |8 
 vbahelper/source/vbahelper/vbadialogbase.cxx   |2 +-
 vbahelper/source/vbahelper/vbadocumentbase.cxx |4 ++--
 vbahelper/source/vbahelper/vbaeventshelperbase.cxx |   12 ++--
 vbahelper/source/vbahelper/vbahelper.cxx   |4 ++--
 12 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 7f585002c460a095693eeec4453b869b3915118b
Author: Olivier Hallot 
Date:   Sat Jan 28 11:59:23 2012 -0200

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

Part LVI
Modules
vbahelper

diff --git a/vbahelper/source/msforms/vbacombobox.cxx 
b/vbahelper/source/msforms/vbacombobox.cxx
index 6f5049c..d9e9527 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -62,7 +62,7 @@ ScVbaComboBox::ScVbaComboBox( const uno::Reference< 
XHelperInterface >& xParent,
 catch( uno::Exception& )
 {
 }
-if( sSourceName.getLength() == 0 )
+if( sSourceName.isEmpty() )
 sSourceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) );
 }
 
@@ -110,7 +110,7 @@ ScVbaComboBox::getListIndex() throw (uno::RuntimeException)
 {
 rtl::OUString sText = getText();
 sal_Int32 nLen = sItems.getLength();
-for ( sal_Int32 index = 0; sText.getLength() && index < nLen; ++index )
+for ( sal_Int32 index = 0; !sText.isEmpty() && index < nLen; ++index )
 {
 if ( sItems[ index ].equals( sText ) )
 {
diff --git a/vbahelper/source/msforms/vbacontrols.cxx 
b/vbahelper/source/msforms/vbacontrols.cxx
index 53706cf..c62cb5a 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -288,10 +288,10 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& 
Object, const uno::Any& St
 // TODO: Support Before and After?
 ::rtl::OUString aNewName;
 StringKey >>= aNewName;
-if ( !aNewName.getLength() )
+if ( aNewName.isEmpty() )
 {
 aNewName = aComServiceName;
-if ( !aNewName.getLength() )
+if ( aNewName.isEmpty() )
 aNewName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"Control" ) );
 
 sal_Int32 nInd = 0;
@@ -303,7 +303,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& 
Object, const uno::Any& St
 }
 
 double fDefWidth = 72.0, fDefHeight = 18.0;
-if ( aComServiceName.getLength() )
+if ( !aComServiceName.isEmpty() )
 {
 // create a UNO control model based on the passed control type
 uno::Reference< awt::XControlModel > xNewModel;
@@ -464,12 +464,12 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& 
StringKeyOrIndex )
 uno::Reference< lang::XMultiServiceFactory > xModelFactory( 
mxDialog->getModel(), uno::UNO_QUERY_THROW );
 uno::Reference< container::XNameContainer > xDialogContainer( 
xModelFactory, uno::UNO_QUERY_THROW );
 
-if ( !( ( StringKeyOrIndex >>= aControlName ) && 
aControlName.getLength() )
+if ( !( ( StringKeyOrIndex >>= aControlName ) && 
!aControlName.isEmpty() )
   && !( ( StringKeyOrIndex >>= nIndex ) && nIndex >= 0 && nIndex < 
m_xIndexAccess->getCount() ) )
 throw uno::RuntimeException();
 
 uno::Reference< awt::XControl > xControl;
-if ( aControlName.getLength() )
+if ( !aControlName.isEmpty() )
 {
 uno::Reference< awt::XControlContainer > xControlContainer( 
mxDialog, uno::UNO_QUERY_THROW );
 xControl = xControlContainer->getControl( aControlName );
@@ -482,7 +482,7 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& 
StringKeyOrIndex )
 if ( !xControl.is() )
 throw uno::RuntimeException();
 
-if ( !aControlName.getLength() )
+if ( aControlName.isEmpty() )
 aControlName = ControlArrayWrapper::getControlName( xControl );
 
 xDialogContainer->removeByName( aControlName );
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx 
b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index 828c766..8186d3d 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -161,7 +161,7 @@ ListControlHelper::Clear(  ) throw (uno::RuntimeException)
 void SAL_CALL
 ListControlHelper::setRowSource( const rtl::OUString& _rowsource ) throw 
(uno::RuntimeException)
 {
-if ( _rowsou

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

2012-01-28 Thread Takeshi Abe
 basic/source/inc/iosys.hxx   |1 -
 basic/source/inc/runtime.hxx |1 +
 basic/source/runtime/methods.cxx |   14 +++---
 basic/source/sbx/sbxvar.cxx  |1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 9fedf7bcfa4cb3e0064e68b96b12c7f4a43f17a6
Author: Takeshi Abe 
Date:   Sun Jan 29 01:15:09 2012 +0900

Removed unused define and extern

diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index f9e7319..4cc0f9b 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -38,7 +38,6 @@ class SvStream;
 // implemented at the moment.
 
 #define CHANNELS 256
-#define CONSOLE  0
 
 #define SBSTRM_INPUT0x0001
 #define SBSTRM_OUTPUT   0x0002
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index e4ad651..d00115a 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -45,7 +45,6 @@ using namespace com::sun::star::uno;
 TYPEINIT1(SbxVariable,SbxValue)
 TYPEINIT1(SbxHint,SfxSimpleHint)
 
-extern sal_uInt32 nVarCreator;  // in SBXBASE.CXX, for LoadData()
 #ifdef DBG_UTIL
 static sal_uIntPtr nVar = 0;
 #endif
commit b6ca3a8287ac10c6877d5e7dd43622dbd138cde5
Author: Takeshi Abe 
Date:   Sun Jan 29 00:44:01 2012 +0900

Use defined macro instead of magic number

This also added a missing READONLY entry

diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 890b658..8c9064d 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -116,6 +116,7 @@ struct SbiGosubStack {  // GOSUB-Stack:
 #define MAXRECURSION 500
 
 #define Sb_ATTR_NORMAL  0x
+#define Sb_ATTR_READONLY0x0001
 #define Sb_ATTR_HIDDEN  0x0002
 #define Sb_ATTR_SYSTEM  0x0004
 #define Sb_ATTR_VOLUME  0x0008
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e457b2e..efcf67f 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2877,11 +2877,11 @@ RTLFUNC(GetAttr)
 sal_Bool bHidden = xSFI->isHidden( aPath );
 sal_Bool bDirectory = xSFI->isFolder( aPath );
 if( bReadOnly )
-nFlags |= 0x0001; // ATTR_READONLY
+nFlags |= Sb_ATTR_READONLY;
 if( bHidden )
-nFlags |= 0x0002; // ATTR_HIDDEN
+nFlags |= Sb_ATTR_HIDDEN;
 if( bDirectory )
-nFlags |= 0x0010; // ATTR_DIRECTORY
+nFlags |= Sb_ATTR_DIRECTORY;
 }
 catch(const Exception & )
 {
@@ -2901,9 +2901,9 @@ RTLFUNC(GetAttr)
 FileStatus::Type aType = aFileStatus.getFileType();
 sal_Bool bDirectory = isFolder( aType );
 if( bReadOnly )
-nFlags |= 0x0001; // ATTR_READONLY
+nFlags |= Sb_ATTR_READONLY;
 if( bDirectory )
-nFlags |= 0x0010; // ATTR_DIRECTORY
+nFlags |= Sb_ATTR_DIRECTORY;
 }
 rPar.Get(0)->PutInteger( nFlags );
 }
@@ -4259,9 +4259,9 @@ RTLFUNC(SetAttr)
 {
 try
 {
-sal_Bool bReadOnly = (nFlags & 0x0001) != 0; // 
ATTR_READONLY
+sal_Bool bReadOnly = (nFlags & Sb_ATTR_READONLY) != 0;
 xSFI->setReadOnly( aStr, bReadOnly );
-sal_Bool bHidden   = (nFlags & 0x0002) != 0; // ATTR_HIDDEN
+sal_Bool bHidden   = (nFlags & Sb_ATTR_HIDDEN) != 0;
 xSFI->setHidden( aStr, bHidden );
 }
 catch(const Exception & )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sd/source

2012-01-28 Thread Julien Nabet
 sd/source/ui/view/outlview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 763b3e1e598ae0ebe29c9168f5dc2a73f910ce38
Author: Julien Nabet 
Date:   Sat Jan 28 18:53:25 2012 +0100

Fix duplicateExpression style Same expression on both sides of '&&

diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 53ebbb4..85239e8 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1620,7 +1620,7 @@ IMPL_LINK(OutlineView, EventMultiplexerListener, 
::sd::tools::EventMultiplexerEv
 break;
 
 case tools::EventMultiplexerEvent::EID_PAGE_ORDER:
-if (mpOutliner != NULL && mpDoc!=NULL && mpOutliner != NULL && 
dynamic_cast ( mpOutliner )->GetIgnoreCurrentPageChangesLevel()==0)
+if (mpOutliner != NULL && mpDoc!=NULL && 
dynamic_cast ( mpOutliner )->GetIgnoreCurrentPageChangesLevel()==0)
 {
 if (((mpDoc->GetPageCount()-1)%2) == 0)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-01-28 Thread Ivan Timofeev
 sfx2/inc/sfx2/dispatch.hxx   |1 -
 sfx2/source/control/dispatch.cxx |   12 +---
 sfx2/source/view/viewfrm.cxx |3 ---
 3 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit ff2c26f586c87452a23f307f4b63568e5276538c
Author: Ivan Timofeev 
Date:   Sat Jan 28 22:06:19 2012 +0400

bUILocked is always false

diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index c517632..5aa01d9 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -198,7 +198,6 @@ public:
 SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const;
 SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell 
**ppShell, const SfxSlot **ppSlot,
   sal_Bool bOwnShellsOnly, 
sal_Bool bModal, sal_Bool bRealSlot=sal_True );
-SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True );
 SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool  bOn );
 SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const;
 SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) 
const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 5ad8d58..1f722c0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -145,7 +145,6 @@ struct SfxDispatcher_Impl
 std::vector aChildWins;
 sal_uInt16   nActionLevel;  // in EnterAction
 sal_uInt32   nEventId;  // EventId UserEvent
-sal_Bool bUILocked; // Update disconnected (no flicker)
 sal_Bool bNoUI; // UI only from Parent Dispatcher
 sal_Bool bReadOnly; // Document is ReadOnly
 sal_Bool bQuiet;// Only use parent dispatcher
@@ -330,7 +329,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
 pImp->bLocked = sal_False;
 pImp->bActive = sal_False;
 pImp->pParent = NULL;
-pImp->bUILocked = sal_False;
 pImp->bNoUI = sal_False;
 pImp->bReadOnly = sal_False;
 pImp->bQuiet = sal_False;
@@ -1305,7 +1303,7 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce )
 
 Flush();
 
-if ( !pImp->pFrame || pImp->bUILocked )
+if ( !pImp->pFrame )
 return;
 
 SFX_APP();  // -Wall is this required???
@@ -2183,14 +2181,6 @@ sal_uInt32 SfxDispatcher::GetObjectBarId( sal_uInt16 
nPos ) const
 return pImp->aObjBars[nPos].nResId;
 }
 
-void SfxDispatcher::LockUI_Impl( sal_Bool bLock )
-{
-sal_Bool bWasLocked = pImp->bUILocked;
-pImp->bUILocked = bLock;
-if ( !bLock && bWasLocked )
-Update_Impl( sal_True );
-}
-
 //-
 void SfxDispatcher::HideUI( sal_Bool bHide )
 {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b6584e0..e342fad 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1876,9 +1876,6 @@ void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame 
*pViewFrame )
 {
 if ( pViewFrame != pImp->pActiveChild )
 {
-if ( !pImp->pActiveChild )
-GetDispatcher()->LockUI_Impl( sal_False );
-
 pImp->pActiveChild = pViewFrame;
 
 Reference< XFramesSupplier > xFrame( GetFrame().GetFrameInterface(), 
UNO_QUERY );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 97a0d15e61e991e84e6229ea90f6fc7fc301b379
Author: Michael Stahl 
Date:   Sat Jan 28 20:18:21 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 20fc1e56e329e6d3f93c52d7af24f32d7571de3c
Author: Michael Stahl 
Date:   Sat Jan 28 20:52:00 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 00a6c3c148e4c0e867816b4c361abb19d9ece7eb
Author: Michael Stahl 
Date:   Sat Jan 28 20:52:10 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit f457a7fdbb4400f34844af0492dc32d2f3623c95
Author: Michael Stahl 
Date:   Sat Jan 28 20:52:27 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 2e626373db2412ac22e8c5c27a60d11cd29e875b
Author: Michael Stahl 
Date:   Sat Jan 28 20:52:45 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 171a91841e447a76f9cb1e5b42ab85e23e8a4ca2
Author: Michael Stahl 
Date:   Sat Jan 28 20:52:50 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 428df2c52fba1dfd728bff7bc981e00b983704dd
Author: Michael Stahl 
Date:   Sat Jan 28 20:53:39 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 0e1042f42101dd2a7407a38d204de6f4de28890a
Author: Michael Stahl 
Date:   Sat Jan 28 20:53:50 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 58fa560e45fd47f86883f5efd9ea061cb6b37411
Author: Michael Stahl 
Date:   Sat Jan 28 20:54:28 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 371976860088a3c5c3df9840dcdfd632d9d6f1f5
Author: Michael Stahl 
Date:   Sat Jan 28 20:55:39 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 4217d797c07ce2d4cc2f8de9a539b7e75d98245f
Author: Michael Stahl 
Date:   Sat Jan 28 20:55:43 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 0f8d16e119f6a66407669662237aa3b2631bbe4b
Author: Michael Stahl 
Date:   Sat Jan 28 20:55:55 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 417392b0c2501134a6c290b61eb0a886c7acb4c2
Author: Michael Stahl 
Date:   Sat Jan 28 20:56:23 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 2f006bd6eafdb89c8ad6092f5c5a113eb9791054
Author: Michael Stahl 
Date:   Sat Jan 28 20:56:25 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit c687d917f059089d41545c995597357568adce92
Author: Michael Stahl 
Date:   Sat Jan 28 20:56:31 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 0618b588eadef3ca06adddfaabb9058f7fd8561f
Author: Michael Stahl 
Date:   Sat Jan 28 20:56:59 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 2716f7dce26f16a2b677c178aa7d01cea096ae47
Author: Michael Stahl 
Date:   Sat Jan 28 20:57:40 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
commit 32835b23716bb48eb6457dd8bbda235eda6a9968
Author: Michael Stahl 
Date:   Sat Jan 28 20:57:58 2012 +0100

replace obsolete "master" branch with README that points at new repo

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-backup'

2012-01-28 Thread Michael Stahl
New branch 'master-backup' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'master-deleted'

2012-01-28 Thread Michael Stahl
New branch 'master-deleted' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 4 commits - vcl/unx

2012-01-28 Thread Thomas Arnhold
 vcl/unx/generic/app/saldata.cxx |7 
 vcl/unx/generic/app/saldisp.cxx |   59 
 2 files changed, 66 deletions(-)

New commits:
commit da15496978332189d3eb002b1c49e4b7fb6b2848
Author: Thomas Arnhold 
Date:   Sat Jan 28 21:39:48 2012 +0100

Remove VisualClassName

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d253cd6..5269065 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -99,15 +99,6 @@ using ::rtl::OUString;
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-= static variables -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-static const char* const VisualClassName[] = {
-"StaticGray",
-"GrayScale",
-"StaticColor",
-"PseudoColor",
-"TrueColor",
-"DirectColor"
-};
-
 static const char* const EventNames[] =
 {
 NULL,
@@ -2245,10 +2236,6 @@ void SalDisplay::PrintInfo() const
  GetVisual(m_nXDefaultScreen).red_mask,
  GetVisual(m_nXDefaultScreen).green_mask,
  GetVisual(m_nXDefaultScreen).blue_mask );
-fprintf( stderr, "\tVisual\t%d-bit %s ID=0x%x\n",
- GetVisual(m_nXDefaultScreen).GetDepth(),
- VisualClassName[ GetVisual(m_nXDefaultScreen).GetClass() ],
- sal::static_int_cast< unsigned int 
>(GetVisual(m_nXDefaultScreen).GetVisualId()) );
 }
 
 void SalDisplay::addXineramaScreenUnique( int i, long i_nX, long i_nY, long 
i_nWidth, long i_nHeight )
commit c3ac689d50d5fe3c01ddf304506d6b4711062bea
Author: Thomas Arnhold 
Date:   Sat Jan 28 21:31:34 2012 +0100

simplify PSEUDOCOLOR12

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b343195..d253cd6 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -92,14 +92,6 @@ using ::rtl::OUString;
 
 // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#define PSEUDOCOLOR12
-#define PSEUDOCOLOR8
-#define TRUECOLOR24
-#define TRUECOLOR16
-#define TRUECOLOR15
-#define TRUECOLOR12
-#define TRUECOLOR8
-
 #define SALCOLOR_WHITE  MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
 #define SALCOLOR_BLACK  MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
 
@@ -296,10 +288,8 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
 {
 if( pVInfos[i].depth <= 8 )
 bUsable = sal_True;
-#ifdef PSEUDOCOLOR12
 else if( pVInfos[i].depth == 12 )
 bUsable = sal_True;
-#endif
 }
 pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
 pWeight[ i ] -= pVInfos[ i ].visualid;
@@ -2803,11 +2793,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const
 
 if( m_aPalette.empty()
 && m_hColormap
-#ifdef PSEUDOCOLOR12
 && m_aVisual.GetDepth() <= 12
-#else
-&& m_aVisual.GetDepth() <= 8
-#endif
 && m_aVisual.GetClass() == PseudoColor )
 ((SalColormap*)this)->GetPalette();
 }
@@ -2867,11 +2853,7 @@ Pixel SalColormap::GetPixel( SalColor nSalColor ) const
 {
 if( m_aPalette.empty()
 && m_hColormap
-#ifdef PSEUDOCOLOR12
 && m_aVisual.GetDepth() <= 12
-#else
-&& m_aVisual.GetDepth() <= 8
-#endif
 && m_aVisual.GetClass() == PseudoColor ) // what else ???
 ((SalColormap*)this)->GetPalette();
 
commit 10e3da7bf2125091ab69efa2b8f72dc1232052f0
Author: Thomas Arnhold 
Date:   Sat Jan 28 21:27:54 2012 +0100

sal_TrueCOLOR is never defined

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 119f08c..b343195 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -291,30 +291,6 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
 nTrueColor = 2048;
 if( pVInfos[i].depth == 24 )
 bUsable = sal_True;
-#ifdef sal_TrueCOLOR8
-else if( pVInfos[i].depth == 8 )
-{
-nTrueColor = -1; // strongly discourage 8 bit true color
-bUsable = sal_True;
-}
-#endif
-#ifdef sal_TrueCOLOR15
-else if( pVInfos[i].depth == 15 )
-bUsable = sal_True;
-#endif
-#ifdef sal_TrueCOLOR16
-else if( pVInfos[i].depth == 16 )
-bUsable = sal_True;
-#endif
-#ifdef sal_TrueCOLOR32
-else if( pVInfos[i].depth == 32 )
-{
-nTrueColor = 256;
-// we do not have use for an alpha channel
-// better use a 24 or 16 bit truecolor visual if possible
-bUsable = sal_True;
-}
-#endif
 }
 else if( pVInfos[i].c_class == PseudoColor )
 {
commit 047696ea1072ff5

[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -

2012-01-28 Thread Norbert Thiebaud
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -

2012-01-28 Thread Norbert Thiebaud
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/soenv2' - 0 commits -

2012-01-28 Thread Norbert Thiebaud
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'feature/soenv2'

2012-01-28 Thread Norbert Thiebaud
New branch 'feature/soenv2' available with the following commits:
commit f1121e4d78a0b106fe7a7d1bcde57adec6d49154
Author: Norbert Thiebaud 
Date:   Sat Jan 28 18:10:31 2012 -0600

gbuildify apple_remote

commit 71172716d6bd98c0ded1df04398352bb5ae154ec
Author: Norbert Thiebaud 
Date:   Thu Jan 26 16:29:26 2012 -0600

autogen properly on default target.. and do not autogen on clean/distclean

commit 73121366335b2bb2d1983549ecf1d005ea6f3eb7
Author: Norbert Thiebaud 
Date:   Thu Jan 26 14:26:49 2012 -0600

autogen when necessary and restart the make..

commit f8ed77a59a6b712fce7cad2000ce1c7731892fda
Author: Norbert Thiebaud 
Date:   Thu Jan 26 02:32:45 2012 -0600

gb_WinResTarget__command never has 3 parameters

commit 88f31d9d78e0b616797a26d34d288514b962a55a
Author: Norbert Thiebaud 
Date:   Thu Jan 26 02:31:08 2012 -0600

gb_Helper_convert_native should not introduce superflous spaces

that broke a case where we had -DMISC=$(call gb_Helper_conver_native,...)
which transformed in to -DMISC=   d:/foo/bar
and broke the build

commit a5b07cdf370e73719734f98c8cd88cba9f194ea0
Author: Norbert Thiebaud 
Date:   Thu Jan 26 02:28:45 2012 -0600

REPODIR could be a drive i.e D:/ in that case we want to strip the '/'

otherwise we construct file like d://libo/... which break stuf

commit f99c91c019d373a4cd3a19a68b9424e29ae79aa3
Author: Norbert Thiebaud 
Date:   Wed Jan 25 17:24:04 2012 -0600

adjust gbuild doc

commit b2c3edd891d93ed6a56a22861b883fda658ffc9d
Author: Norbert Thiebaud 
Date:   Wed Jan 25 17:23:51 2012 -0600

fixes for windows build for config_host.mk based build

commit d0088d00f45c954d02165e9a5483c3c8a65e18f6
Author: Norbert Thiebaud 
Date:   Wed Jan 25 17:22:58 2012 -0600

add cmd target to deal with corner case operations

commit e915242798196b523ac2ef34cdd898b096a20832
Author: Norbert Thiebaud 
Date:   Wed Jan 25 07:25:16 2012 -0600

dmake-invoked gnumake may need implicite rules... avoid impacting theem

commit a9d9c19499c8a51265846867cf266ea948baca3d
Author: Norbert Thiebaud 
Date:   Tue Jan 24 15:48:30 2012 -0600

switch to include-based build rather than sourced-based build

commit 53c349e9e3c268782d2d13ae41b8172feeaa2cd8
Author: Norbert Thiebaud 
Date:   Sat Jan 21 19:40:28 2012 -0600

coup de grace for Env.Host.sh and associated files

commit 0d66b71ec487e08990bf536afd222a090964c3e2
Author: Norbert Thiebaud 
Date:   Fri Jan 20 20:15:51 2012 -0600

remove everything possible but PATH from set_soenv

only PATH and SOLARENV which is used as a trigger to call Env.Host.sh
are left...

commit 44d7f41a512548bd48191a9add0728c4f13a7e2b
Author: Norbert Thiebaud 
Date:   Fri Jan 20 18:59:24 2012 -0600

windows fix. some path need to be 'formatted' appropriately

commit 074da05e8bce95954df4e1700502e3c83e84fb5c
Author: Norbert Thiebaud 
Date:   Fri Jan 20 18:58:48 2012 -0600

remove the export unused JAVAHOME variable

JAVAHOME is used in an obscure test module in moz, that does not seems
to be run anyway... other than that, no trace of it
so no need to export it.

commit e5933f3cc64c1ac2afdb1be4228efd1579419cf0
Author: Norbert Thiebaud 
Date:   Thu Jan 19 02:00:03 2012 -0600

migrate a bunch of mostly windows related variables + clean-up in set_soenv

commit d8a04bf845c15038f8b0cfb759140bcd086ddb9b
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:58:22 2012 -0600

ENABLE_RPATH and LINKFLAGSRUNPATH are not used

commit 3aaf3307a3c12356b4708d5e6a95a684b931dc9f
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:55:59 2012 -0600

migrate TARFILE_LOCATION out of set_soenv

commit 7dd4b19db50388eac1b855614062f8e6ac568587
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:53:39 2012 -0600

avoid exporting un-necessary symbol/alias for stable scripts

commit 96b20d656e71285dc147c7faa3ad60238dcd9b09
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:52:10 2012 -0600

migrate WITH_POOR_HELP_LOCALIZATIONS out of set_soenv

commit d54eb28abebc7ec9ea994caac5a89dc3eb3297f9
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:48:41 2012 -0600

migrate ENABLE_DEBUG out of set_soenv

commit d6d87343dbef33ff35c2317b5fcfcb85fd00095f
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:46:38 2012 -0600

WITH_VC_REDIST does not need exporting. it is a SCPDEFS only info

commit 985cb2df2ffc1dee66c92faad742ac9e2c9c3cb8
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:44:29 2012 -0600

migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv

commit 7ea5c7993f5b113e1adfce7c7fa15ea3d89ba1bf
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:34:37 2012 -0600

migrate SYSBASE out of set_soenv

commit a186a581d4f97fe55867cc180ae0404cb4bcf70f
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:31:21 2012 -0600

migrate EXTERNAL_WARNINGS_NOT_ERRORS out of set_soenv

commit d85585c1bb3abc5bcd4eb97ca2fa953994b7af5d
Author: Norbert Thiebaud 
Date:   Thu Jan 19 01:28:32 2012 -0600

replace SOLARSRC by SRC_ROOT and get rid 

[Libreoffice-commits] Changes to 'feature/soenv2'

2012-01-28 Thread Norbert Thiebaud
New branch 'feature/soenv2' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'feature/soenv2'

2012-01-28 Thread Norbert Thiebaud
New branch 'feature/soenv2' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits