[Libreoffice-commits] .: tools/bootstrp

2012-02-05 Thread Julien Nabet 
 tools/bootstrp/cppdep.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 992e1a772e01a53673fb6cdd3467102a486f4e59
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Feb 5 09:27:48 2012 +0100

Some cppcheck cleaning

diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index 3c3fd61..979201b 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -150,12 +150,8 @@ rtl::OString CppDep::Exists(const rtl::OString rFileName)
 if ( stat( pFullName, aBuf ) == 0 )
 {
 #ifdef DEBUG_VERBOSE
-fprintf( stderr, Got Dependency , pFullName );
+fprintf( stderr, Got Dependency %s \\\n, pFullName );
 #endif
-#ifdef DEBUG_VERBOSE
-fprintf( stderr, %s \\\n, pFullName );
-#endif
-
 return rtl::OString(pFullName);
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bridges/source

2012-02-05 Thread Julien Nabet 
 bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx |2 --
 bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx |2 --
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx   |2 --
 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx  |2 --
 bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx  |2 --
 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx  |2 --
 bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx  |2 --
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx   |2 --
 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |2 --
 bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx  |2 --
 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx |2 --
 bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx |2 --
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx|2 --
 bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx  |2 --
 bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx   |2 --
 bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx   |2 --
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx|2 --
 17 files changed, 34 deletions(-)

New commits:
commit 9377bb4dcc0d179293c044663c0bea5a113b64d9
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Feb 5 10:19:40 2012 +0100

Some cppcheck cleaning

diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
index 457b4f6..ca6b6a5 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -442,8 +442,6 @@ static typelib_TypeClass cpp_mediate(
 throw RuntimeException(
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no member description 
found! )),
 (XInterface *)pThis );
-// is here for dummy
-eRet = typelib_TypeClass_VOID;
 }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index bc049b5..eed34e3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -490,8 +490,6 @@ static typelib_TypeClass cpp_mediate(
 throw RuntimeException(
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no member description 
found! )),
 (XInterface *)pCppI );
-// is here for dummy
-eRet = typelib_TypeClass_VOID;
 }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 91b96cd..d347aa0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -393,8 +393,6 @@ namespace
 throw RuntimeException(
 OUString( RTL_CONSTASCII_USTRINGPARAM( no member description 
found! )),
 (XInterface *)pCppI );
-// is here for dummy
-eRet = typelib_TypeClass_VOID;
 }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index e962174..e2d9f83 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -533,8 +533,6 @@ namespace
 throw RuntimeException(
 OUString( RTL_CONSTASCII_USTRINGPARAM( no member description 
found! )),
 (XInterface *)pCppI );
-// is here for dummy
-eRet = typelib_TypeClass_VOID;
 }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index c496ab0..12ba0f6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -473,8 +473,6 @@ static typelib_TypeClass cpp_mediate(
 throw RuntimeException(
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no member description 
found! )),
 (XInterface *)pThis );
-// is here for dummy
-eRet = typelib_TypeClass_VOID;
 }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 7c46d1a..6cc5cce 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -401,8 +401,6 @@ namespace
 throw RuntimeException(
 OUString( RTL_CONSTASCII_USTRINGPARAM( no member description 
found! )),
 (XInterface *)pCppI );
-// is here for dummy
-eRet = typelib_TypeClass_VOID;
 }
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index f1597c3..a275312 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++

[Libreoffice-commits] .: comphelper/source cui/source filter/source framework/source sfx2/source svl/source svx/source

2012-02-05 Thread Julien Nabet 
 comphelper/source/misc/mediadescriptor.cxx|8 ++--
 cui/source/customize/cfgutil.cxx  |   24 +++---
 filter/source/config/cache/filtercache.cxx|4 +-
 framework/source/dispatch/dispatchinformationprovider.cxx |4 +-
 framework/source/services/pathsettings.cxx|   12 +++
 sfx2/source/appl/appserv.cxx  |8 ++--
 sfx2/source/appl/workwin.cxx  |8 ++--
 svl/source/config/itemholder2.cxx |4 +-
 svx/source/unodraw/recoveryui.cxx |4 +-
 9 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit fa6665282e2a7c8753eb35b2f03499134413caca
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Feb 5 10:49:59 2012 +0100

Some cppcheck cleaning

diff --git a/comphelper/source/misc/mediadescriptor.cxx 
b/comphelper/source/misc/mediadescriptor.cxx
index 90b713c..038e718 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -369,8 +369,8 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
 }
 }
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException )
+{ throw; }
 catch(const css::uno::Exception)
 {}
 
@@ -750,8 +750,8 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const 
::rtl::OUString sURL, s
 return xUriRef-getUriReference();
 }
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
 catch(const css::uno::Exception)
 {}
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f5fb4a8..02055ae 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -172,8 +172,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl 
aStyle)
 if (xStyle.is())
 xStyle-getPropertyValue(STYLEPROP_UINAME) = aStyle.sLabel;
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
 catch(const css::uno::Exception)
 { aStyle.sLabel = ::rtl::OUString(); }
 
@@ -212,8 +212,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl 
aStyle)
 else
 xFamilyInfo-getPropertyValue(STYLEPROP_UINAME) = 
aFamilyInfo.sLabel;
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
 catch(const css::uno::Exception)
 { return ::std::vector SfxStyleInfo_Impl (); }
 
@@ -236,8 +236,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl 
aStyle)
 xFamilies-getByName(sFamily) = xStyleSet;
 lStyleNames = xStyleSet-getElementNames();
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
 catch(const css::uno::Exception)
 { return ::std::vector SfxStyleInfo_Impl (); }
 
@@ -259,8 +259,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl 
aStyle)
 continue;
 xStyle-getPropertyValue(PROP_UINAME) = aStyleInfo.sLabel;
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
 catch(const css::uno::Exception)
 { continue; }
 
@@ -513,8 +513,8 @@ void SfxConfigGroupListBox_Impl::InitModule()
 pEntry-SetUserData(pInfo);
 }
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
 catch(const css::uno::Exception)
 {}
 }
@@ -879,8 +879,8 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference 
XComponentContext  xC
 sUIName = 
lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Name)
 ), ::rtl::OUString());
 }
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
 catch(css::uno::Exception)
 { sUIName = ::rtl::OUString(); }
 
diff --git a/filter/source/config/cache/filtercache.cxx 
b/filter/source/config/cache/filtercache.cxx
index b623e13..ca1af31 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -931,8 +931,8 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const 
::rtl::OUString sDirect
 {
 aValue = xAccess-getByName(sKey);
 }
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{

[Libreoffice-commits] .: connectivity/source

2012-02-05 Thread Julien Nabet 
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit df58753d51c41253f26104d146a73ba74c42e33e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Feb 5 13:23:59 2012 +0100

Remove wrong return

This return prevented the execution of the following code

diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx 
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index f3c768d..865c906 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -1039,8 +1039,6 @@ Reference XResultSet  SAL_CALL 
MacabDatabaseMetaData::getProcedures(
 Reference XResultSet  SAL_CALL MacabDatabaseMetaData::getVersionColumns(
 const Any, const ::rtl::OUString, const ::rtl::OUString table ) 
throw(SQLException, RuntimeException)
 {
-return new ODatabaseMetaDataResultSet( 
ODatabaseMetaDataResultSet::eVersionColumns );
-
 ::connectivity::ODatabaseMetaDataResultSet* pResult = new 
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
 Reference XResultSet  xRef = pResult;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-05 Thread Ivan Timofeev 
 sc/inc/cellsuno.hxx |4 --
 sc/source/filter/xml/XMLExportDDELinks.cxx  |   17 --
 sc/source/filter/xml/XMLExportDDELinks.hxx  |2 -
 sc/source/filter/xml/xmlfilti.cxx   |   11 --
 sc/source/filter/xml/xmlfilti.hxx   |2 -
 sc/source/ui/unoobj/cellsuno.cxx|   33 
 sc/source/ui/vba/vbacommentshape.cxx|6 ---
 sc/source/ui/vba/vbacommentshape.hxx|3 -
 sc/source/ui/vba/vbawindows.cxx |5 ---
 sc/source/ui/vba/vbawindows.hxx |1 
 unusedcode.easy |   16 -
 vbahelper/inc/vbahelper/vbashape.hxx|1 
 vbahelper/inc/vbahelper/vbashapes.hxx   |1 
 vbahelper/source/vbahelper/vbacommandbarcontrol.cxx |5 ---
 vbahelper/source/vbahelper/vbacommandbarcontrol.hxx |1 
 vbahelper/source/vbahelper/vbashape.cxx |6 ---
 vbahelper/source/vbahelper/vbashapes.cxx|   28 
 xmloff/inc/SchXMLExport.hxx |2 -
 xmloff/source/chart/SchXMLExport.cxx|   28 
 xmloff/source/chart/SchXMLPlotAreaContext.cxx   |8 
 xmloff/source/chart/SchXMLPlotAreaContext.hxx   |2 -
 21 files changed, 182 deletions(-)

New commits:
commit 9c06348b32bd799241f23b1c2d75a46cf498d015
Author: Elton Chung el...@layerjet.com
Date:   Sun Feb 5 14:39:47 2012 +0800

Remove unused code.

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 8d17087..c2733bd 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -869,10 +869,6 @@ public:
 
 // XML import needs to set results at formula 
cells,
 // not meant for any other purpose.
-voidSetFormulaResultString( const ::rtl::OUString 
rResult );
-voidSetFormulaResultDouble( double fResult );
-voidSetFormulaWithGrammar( const ::rtl::OUString 
rFormula,
-const ::rtl::OUString rFormulaNmsp, const 
formula::FormulaGrammar::Grammar );
 const ScAddressGetPosition() const { return aCellPos; }
 
 voidInputEnglishString( const ::rtl::OUString rText );
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx 
b/sc/source/filter/xml/XMLExportDDELinks.cxx
index 81734b9..e828f74 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -54,23 +54,6 @@ ScXMLExportDDELinks::~ScXMLExportDDELinks()
 {
 }
 
-bool ScXMLExportDDELinks::CellsEqual(const bool bPrevEmpty, const bool 
bPrevString, const String sPrevValue, const double fPrevValue,
- const bool bEmpty, const bool bString, const String 
sValue, const double fValue) const
-{
-if (bEmpty == bPrevEmpty)
-if (bEmpty)
-return true;
-else if (bString == bPrevString)
-if (bString)
-return (sPrevValue == sValue);
-else
-return (fPrevValue == fValue);
-else
-return false;
-else
-return false;
-}
-
 void ScXMLExportDDELinks::WriteCell(const ScMatrixValue aVal, sal_Int32 
nRepeat)
 {
 bool bString = ScMatrix::IsNonValueType(aVal.nType);
diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx 
b/sc/source/filter/xml/XMLExportDDELinks.hxx
index 74171a9..e92fa20 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.hxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx
@@ -39,8 +39,6 @@ class ScXMLExportDDELinks
 {
 ScXMLExportrExport;
 
-boolCellsEqual(const bool bPrevEmpty, const bool 
bPrevString, const String sPrevValue, const double fPrevValue,
-const bool bEmpty, const bool bString, 
const String sValue, const double fValue) const;
 voidWriteCell(const ScMatrixValue aVal, sal_Int32 
nRepeat);
 voidWriteTable(const sal_Int32 nPos);
 public:
diff --git a/sc/source/filter/xml/xmlfilti.cxx 
b/sc/source/filter/xml/xmlfilti.cxx
index 54b7f62..a680370 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -167,17 +167,6 @@ void ScXMLFilterContext::EndElement()
 
pDatabaseRangeContext-SetFilterConditionSourceRangeAddress(aConditionSourceRangeAddress);
 }
 
-void ScXMLFilterContext::SetCaseSensitive(bool b)
-{
-mrQueryParam.bCaseSens = b;
-}
-
-void ScXMLFilterContext::SetUseRegularExpressions(bool b)
-{
-if (!bUseRegularExpressions)
-bUseRegularExpressions = b;
-}
-
 void ScXMLFilterContext::OpenConnection(bool b)
 {
 maConnStack.push_back(ConnStackItem(b));
diff --git a/sc/source/filter/xml/xmlfilti.hxx 
b/sc/source/filter/xml/xmlfilti.hxx
index 759f954..952b705 100644
--- a/sc/source/filter/xml/xmlfilti.hxx

[Libreoffice-commits] .: svtools/source

2012-02-05 Thread Matteo Casalin 
 svtools/source/control/valueset.cxx |   26 ++
 1 file changed, 10 insertions(+), 16 deletions(-)

New commits:
commit a0e7d661e0d36e3069b77f6f4b1f55352efbee9a
Author: Matteo Casalin matteo.casa...@gmx.com
Date:   Sun Feb 5 12:23:31 2012 +0100

Removed unused variable

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index cc1d9e6..0c58242 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -339,7 +339,6 @@ void ValueSet::Format()
 WinBits nStyle = GetStyle();
 longnTxtHeight = GetTextHeight();
 longnOff;
-longnSpace;
 longnNoneHeight;
 longnNoneSpace;
 ScrollBar*  pDelScrBar = NULL;
@@ -367,7 +366,6 @@ void ValueSet::Format()
 }
 else
 nOff = 0;
-nSpace = mnSpacing;
 
 // consider size, if NameField does exist
 if ( nStyle  WB_NAMEFIELD )
@@ -388,7 +386,7 @@ void ValueSet::Format()
 if ( nStyle  WB_NONEFIELD )
 {
 nNoneHeight = nTxtHeight+nOff;
-nNoneSpace = nSpace;
+nNoneSpace = mnSpacing;
 if ( nStyle  WB_RADIOSEL )
 nNoneHeight += 8;
 }
@@ -414,7 +412,7 @@ void ValueSet::Format()
 {
 if ( mnUserItemWidth )
 {
-mnCols = (sal_uInt16)((aWinSize.Width()-nScrBarWidth+nSpace) / 
(mnUserItemWidth+nSpace));
+mnCols = (sal_uInt16)((aWinSize.Width()-nScrBarWidth+mnSpacing) / 
(mnUserItemWidth+mnSpacing));
 if ( !mnCols )
 mnCols = 1;
 }
@@ -437,7 +435,7 @@ void ValueSet::Format()
 mnVisLines = mnUserVisLines;
 else if ( mnUserItemHeight )
 {
-mnVisLines = (nCalcHeight-nNoneSpace+nSpace) / 
(mnUserItemHeight+nSpace);
+mnVisLines = (nCalcHeight-nNoneSpace+mnSpacing) / 
(mnUserItemHeight+mnSpacing);
 if ( !mnVisLines )
 mnVisLines = 1;
 }
@@ -454,8 +452,8 @@ void ValueSet::Format()
 }
 
 // calculate item size
-long nColSpace  = (mnCols-1)*nSpace;
-long nLineSpace = ((mnVisLines-1)*nSpace)+nNoneSpace;
+long nColSpace  = (mnCols-1)*mnSpacing;
+long nLineSpace = ((mnVisLines-1)*mnSpacing)+nNoneSpace;
 long nItemWidth;
 long nItemHeight;
 if ( mnUserItemWidth  !mnUserCols )
@@ -583,7 +581,7 @@ void ValueSet::Format()
 // If want also draw parts of items in the last line,
 // then we add one more line if parts of these line are
 // visible
-if ( y+(mnVisLines*(nItemHeight+nSpace))  aWinSize.Height() )
+if ( y+(mnVisLines*(nItemHeight+mnSpacing))  aWinSize.Height() )
 nLastItem += mnCols;
 }
 for ( size_t i = 0; i  nItemCount; i++ )
@@ -612,10 +610,10 @@ void ValueSet::Format()
 if ( !((i+1) % mnCols) )
 {
 x = nStartX;
-y += nItemHeight+nSpace;
+y += nItemHeight+mnSpacing;
 }
 else
-x += nItemWidth+nSpace;
+x += nItemWidth+mnSpacing;
 }
 else
 {
@@ -640,7 +638,7 @@ void ValueSet::Format()
 if ( nStyle  WB_NONEFIELD )
 {
 aPos.Y() = nStartY+nNoneHeight+1;
-aSize.Height() = ((nItemHeight+nSpace)*mnVisLines)-2-nSpace;
+aSize.Height() = 
((nItemHeight+mnSpacing)*mnVisLines)-2-mnSpacing;
 }
 mpScrBar-SetPosSizePixel( aPos, aSize );
 mpScrBar-SetRangeMax( mnLines );
@@ -2380,7 +2378,6 @@ Size ValueSet::CalcWindowSizePixel( const Size 
rItemSize, sal_uInt16 nDesireCol
 SizeaSize( rItemSize.Width()*nCalcCols, 
rItemSize.Height()*nCalcLines );
 WinBits nStyle = GetStyle();
 longnTxtHeight = GetTextHeight();
-longnSpace;
 longn;
 
 if ( nStyle  WB_ITEMBORDER )
@@ -2398,12 +2395,9 @@ Size ValueSet::CalcWindowSizePixel( const Size 
rItemSize, sal_uInt16 nDesireCol
 
 if ( mnSpacing )
 {
-nSpace = mnSpacing;
 aSize.Width()  += mnSpacing*(nCalcCols-1);
 aSize.Height() += mnSpacing*(nCalcLines-1);
 }
-else
-nSpace = 0;
 
 if ( nStyle  WB_NAMEFIELD )
 {
@@ -2414,7 +2408,7 @@ Size ValueSet::CalcWindowSizePixel( const Size 
rItemSize, sal_uInt16 nDesireCol
 
 if ( nStyle  WB_NONEFIELD )
 {
-aSize.Height() += nTxtHeight + n + nSpace;
+aSize.Height() += nTxtHeight + n + mnSpacing;
 if ( nStyle  WB_RADIOSEL )
 aSize.Height() += 8;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-05 Thread Andras Timar 
 cui/source/options/optgdlg.hrc |3 +--
 cui/source/options/optgdlg.src |4 ++--
 cui/source/options/optsave.src |4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 537169e64f34353dab8c6dcacc088fba61729392
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sun Feb 5 11:51:09 2012 +0400

fix various overlapped controls in the Options dialog

Signed-off-by: Andras Timar ati...@suse.com

diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 5e54e0b..d870e29 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -64,8 +64,7 @@
 #define ROW11   (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 #define ROW12   (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 #define ROW13   (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW14   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW15   (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW14   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6)
 
 #define DIFF(v1,v2) (v2-v1)
 #define OFFS_TEXTBOX_FIXEDTEXT(base)
(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 730aa24..0e01fe0 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -188,7 +188,7 @@ TabPage OFA_TP_MISC
 };
 CheckBox CB_EXPERIMENTAL
 {
-Pos = MAP_APPFONT( COL1, ROW15 );
+Pos = MAP_APPFONT( COL1, ROW14 );
 Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
 Text [ en-US ] = Enable experimental (unstable) features;
 };
@@ -456,7 +456,7 @@ TabPage OFA_TP_VIEW
 {
 HelpID = cui:CheckBox:OFA_TP_VIEW:CB_SELECTION;
 Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - 
RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
-Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
+Size = MAP_APPFONT ( 83 , RSC_CD_CHECKBOX_HEIGHT ) ;
 Text [ en-US ] = Transparency ;
 };
 
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index da94bd4..845336f 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -101,7 +101,7 @@ TabPage RID_SFXPAGE_SAVE
 {
 HelpID = cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 210 , 61 ) ;
+Pos = MAP_APPFONT ( 210 , 62 ) ;
 Size = MAP_APPFONT ( 21 , 12 ) ;
 Left = TRUE ;
 Repeat = TRUE ;
@@ -116,7 +116,7 @@ TabPage RID_SFXPAGE_SAVE
 };
 FixedText FT_MINUTE
 {
-Pos = MAP_APPFONT ( 234 , 63 ) ;
+Pos = MAP_APPFONT ( 234 , 64 ) ;
 Size = MAP_APPFONT ( 35 , 8 ) ;
 Text [ en-US ] = Minutes ;
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-05 Thread Markus Mohrhard 
 sc/qa/unit/data/contentCSV/mathematical-functions.csv |3 +++
 sc/qa/unit/data/ods/functions.ods |binary
 2 files changed, 3 insertions(+)

New commits:
commit 01ea91efd98e398e6998837c6bb45a9efea43cdc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Feb 5 16:01:16 2012 +0100

add some more test cases

diff --git a/sc/qa/unit/data/contentCSV/mathematical-functions.csv 
b/sc/qa/unit/data/contentCSV/mathematical-functions.csv
index 5be0251..cebf207 100644
--- a/sc/qa/unit/data/contentCSV/mathematical-functions.csv
+++ b/sc/qa/unit/data/contentCSV/mathematical-functions.csv
@@ -15,3 +15,6 @@
 8
 12
 5
+1.2, 1, 0, 1000
+2, 4, Err:502
+
diff --git a/sc/qa/unit/data/ods/functions.ods 
b/sc/qa/unit/data/ods/functions.ods
index e9426fe..a90a224 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and 
b/sc/qa/unit/data/ods/functions.ods differ
commit 7ee0b42f7cad15abca7218d001ea1b3b4cac028e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Feb 5 15:51:25 2012 +0100

add some helpful entries to test file

diff --git a/sc/qa/unit/data/ods/functions.ods 
b/sc/qa/unit/data/ods/functions.ods
index 9ccb67f..e9426fe 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and 
b/sc/qa/unit/data/ods/functions.ods differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

2012-02-05 Thread François Tigeot 
 sal/osl/unx/file_volume.cxx |  657 
 1 file changed, 657 deletions(-)

New commits:
commit 4fa8d043f8336e7b35130934498f8a4b357967d3
Author: François Tigeot ftig...@wolfpond.org
Date:   Sun Feb 5 13:41:18 2012 +0100

Remove unused floppy-handling code

diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 62c1986..ce9f832 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -112,31 +112,6 @@ typedef struct _oslVolumeDeviceHandleImpl
 
 /**
  *
- *  'removeable device' aka floppy functions
- *
- */
-
-static oslVolumeDeviceHandle  osl_isFloppyDrive(const sal_Char* pszPath);
-static oslFileError   osl_mountFloppy(oslVolumeDeviceHandle hFloppy);
-static oslFileError   osl_unmountFloppy(oslVolumeDeviceHandle hFloppy);
-
-#if defined(SOLARIS)
-static sal_Bool   osl_isFloppyMounted(sal_Char* pszPath, sal_Char* 
pszMountPath);
-static sal_Bool   osl_getFloppyMountEntry(const sal_Char* pszPath, 
sal_Char* pBuffer);
-static sal_Bool   osl_checkFloppyPath(sal_Char* pszPath, sal_Char* 
pszFilePath, sal_Char* pszDevicePath);
-#endif /* SOLARIS */
-
-#if defined(LINUX)
-static sal_Bool   osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice);
-static sal_Bool   osl_getFloppyMountEntry(const sal_Char* pszPath, 
oslVolumeDeviceHandleImpl* pItem);
-#endif /* LINUX */
-
-#ifdef DEBUG_OSL_FILE
-static void   osl_printFloppyHandle(oslVolumeDeviceHandleImpl* 
hFloppy);
-#endif /* DEBUG_OSL_FILE */
-
-/**
- *
  *  C-String Function Declarations
  *
  */
@@ -376,20 +351,6 @@ static oslFileError osl_psz_getVolumeInformation (
 
 #endif /* __OSL_STATFS_TYPENAME */
 
-if (uFieldMask  osl_VolumeInfo_Mask_DeviceHandle)
-{
-/* FIXME: check also entries in mntent for the device
-   and fill it with correct values */
-
-*pInfo-pDeviceHandle = osl_isFloppyDrive(pszDirectory);
-
-if (*pInfo-pDeviceHandle)
-{
-pInfo-uValidFields |= osl_VolumeInfo_Mask_DeviceHandle;
-pInfo-uAttributes  |= osl_Volume_Attribute_Removeable;
-pInfo-uValidFields |= osl_VolumeInfo_Mask_Attributes;
-}
-}
 return osl_File_E_None;
 }
 
@@ -408,8 +369,6 @@ oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle 
Handle )
 {
 oslFileError tErr = osl_File_E_NOSYS;
 
-tErr = osl_unmountFloppy(Handle);
-
  /* Perhaps current working directory is set to mount point */
 
  if ( tErr )
@@ -419,9 +378,6 @@ oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle 
Handle )
 if ( pszHomeDir  strlen( pszHomeDir )  0 == chdir( pszHomeDir ) )
 {
 /* try again */
-
-tErr = osl_unmountFloppy(Handle);
-
 OSL_ENSURE( tErr, osl_unmountVolumeDevice: CWD was set to volume 
mount point );
 }
 }
@@ -437,8 +393,6 @@ oslFileError osl_automountVolumeDevice( 
oslVolumeDeviceHandle Handle )
 {
 oslFileError tErr = osl_File_E_NOSYS;
 
-tErr = osl_mountFloppy(Handle);
-
 return tErr;
 }
 
@@ -475,11 +429,6 @@ oslFileError osl_getVolumeDeviceMountPath( 
oslVolumeDeviceHandle Handle, rtl_uSt
 return osl_File_E_INVAL;
 }
 
-#ifdef DEBUG_OSL_FILE
-fprintf(stderr,Handle is:\n);
-osl_printFloppyHandle(pItem);
-#endif
-
 snprintf(Buffer, sizeof(Buffer), file://%s, pItem-pszMountPoint);
 
 #ifdef DEBUG_OSL_FILE
@@ -579,610 +528,4 @@ static void osl_freeVolumeDeviceHandleImpl 
(oslVolumeDeviceHandleImpl* pHandle)
 }
 #endif
 
-/**
- *
- *  SOLARIS FLOPPY FUNCTIONS
- *
- */
-
-#if defined(SOLARIS)
-/* compare a given devicename with the typical device names on a Solaris box */
-static sal_Bool
-osl_isAFloppyDevice (const char* pDeviceName)
-{
-const char* pFloppyDevice [] = {
-/dev/fd,   /dev/rfd,
-/dev/diskette, /dev/rdiskette,
-/vol/dev/diskette, /vol/dev/rdiskette
-};
-
-int i;
-for (i = 0; i  SAL_N_ELEMENTS(pFloppyDevice); i++)
-{
-if (strncmp(pDeviceName, pFloppyDevice[i], strlen(pFloppyDevice[i])) 
== 0)
-return sal_True;
-}
-return sal_False;
-}
-
-/* compare two directories whether the first may be a parent of the second. 
this
- * does not realpath() resolving */
-static sal_Bool
-osl_isAParentDirectory (const char* pParentDir, const char* pSubDir)
-{
-return strncmp(pParentDir, pSubDir, strlen(pParentDir)) == 0;
-}
-
-/* the name of the routine is obviously silly. But

[Libreoffice-commits] .: editeng/source

2012-02-05 Thread Ivan Timofeev 
 editeng/source/editeng/edtspell.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 1c85118414d91bc0b881f03ad7fac20454ec43a0
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sun Feb 5 22:02:12 2012 +0400

fix debug build

diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index eda0d61..a2340aa 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -505,7 +505,6 @@ bool WrongList::operator==(const WrongList rCompare) const
 return true;
 }
 
-#ifdef DBG_UTIL
 sal_Bool WrongList::DbgIsBuggy() const
 {
 // Check if the ranges overlap.
@@ -524,7 +523,6 @@ sal_Bool WrongList::DbgIsBuggy() const
 }
 return bError;
 }
-#endif
 
 //
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

2012-02-05 Thread Andras Timar 
 cui/source/options/optsave.src |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9a7f53cdcfb40820d7c7f29e2190fb1572611b91
Author: Andras Timar ati...@suse.com
Date:   Sun Feb 5 19:58:17 2012 +0100

fix coordinates on Options - Load/Save - General panel

diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 845336f..eafb980 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -94,14 +94,14 @@ TabPage RID_SFXPAGE_SAVE
 {
 HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE;
 Pos = MAP_APPFONT ( 12 , 63 ) ;
-Size = MAP_APPFONT ( 193 , 10 ) ;
+Size = MAP_APPFONT ( 163 , 10 ) ;
 Text [ en-US ] = Save ~AutoRecovery information every ;
 };
 NumericField ED_AUTOSAVE
 {
 HelpID = cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 210 , 62 ) ;
+Pos = MAP_APPFONT ( 180 , 62 ) ;
 Size = MAP_APPFONT ( 21 , 12 ) ;
 Left = TRUE ;
 Repeat = TRUE ;
@@ -116,8 +116,8 @@ TabPage RID_SFXPAGE_SAVE
 };
 FixedText FT_MINUTE
 {
-Pos = MAP_APPFONT ( 234 , 64 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 204 , 64 ) ;
+Size = MAP_APPFONT ( 65 , 8 ) ;
 Text [ en-US ] = Minutes ;
 };
 CheckBox BTN_RELATIVE_FSYS
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc sal/osl sal/qa sal/util

2012-02-05 Thread François Tigeot 
 sal/inc/osl/file.h|   43 
 sal/inc/osl/file.hxx  |   28 -
 sal/osl/unx/file_volume.cxx   |   80 --
 sal/osl/w32/file_dirvol.cxx   |   18 
 sal/qa/helper/gcov/deprecated.txt |2 
 sal/util/sal.map  |2 
 6 files changed, 173 deletions(-)

New commits:
commit 32009128e4c77cfd6506ab50a5345776de8144e6
Author: François Tigeot ftig...@wolfpond.org
Date:   Sun Feb 5 18:33:57 2012 +0100

Remove unused VolumeDevice functions and related code

diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index 3bcd877..2c2713b 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -467,47 +467,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileStatus(
 
 typedef void *oslVolumeDeviceHandle;
 
-
-/** Unmount a volume device.
-
-Unmount the volume specified by the given oslVolumeDeviceHandle.
-
-@param Handle [in]
-An oslVolumeDeviceHandle received by a call to osl_getVolumeInformation().
-
-@return
-osl_File_E_None on successbr
-
-@todo
-specify all error codes that may be returned
-
-@see osl_getVolumeInformation()
-*/
-
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_unmountVolumeDevice(
-oslVolumeDeviceHandle Handle );
-
-
-/** Automount a volume device.
-
-Automount the volume device specified by the given oslVolumeDeviceHandle.
-
-@param Handle [in]
-An oslVolumeDeviceHandle received by a call to osl_getVolumeInformation().
-
-@return
-osl_File_E_None on successbr
-
-@todo
-specify all error codes that may be returned
-
-@see osl_getVolumeInformation()
-*/
-
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_automountVolumeDevice(
-oslVolumeDeviceHandle Handle );
-
-
 /** Release a volume device handle.
 
 Releases the given oslVolumeDeviceHandle which was acquired by a call to
@@ -575,8 +534,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_acquireVolumeDeviceHandle(
 osl_File_E_EOVERFLOW value too large for defined data typebr
 
 @seeosl_getVolumeInformation()
-@seeosl_automountVolumeDevice()
-@seeosl_unmountVolumeDevice()
 */
 
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_getVolumeDeviceMountPath(
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index d63126b..8c97750 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -388,34 +388,6 @@ public:
 return *this;
 }
 
-/** Automount a volume device.
-
-@return
-E_None on success
-
-@todo
-specify all error codes that may be returned
-*/
-
-inline RC automount()
-{
-return (RC)osl_automountVolumeDevice( _aHandle );
-}
-
-/** Unmount a volume device.
-
-@return
-E_None on success
-
-@todo
-specify all error codes that may be returned
-*/
-
-inline RC unmount()
-{
-return (RC)osl_unmountVolumeDevice( _aHandle );
-}
-
 /** Get the full qualified URL where a device is mounted to.
 
@return
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index ce9f832..42965a7 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -59,14 +59,12 @@
 #include sys/mnttab.h
 #include sys/statvfs.h
 #define  HAVE_STATFS_H
-static const sal_Char* MOUNTTAB=/etc/mnttab;
 
 #elif defined(LINUX)
 
 #include mntent.h
 #include sys/vfs.h
 #define  HAVE_STATFS_H
-static const sal_Char* MOUNTTAB=/etc/mtab;
 
 #elif defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || 
defined(DRAGONFLY)
 
@@ -75,16 +73,11 @@ static const sal_Char* MOUNTTAB=/etc/mtab;
 #include sys/mount.h
 #define  HAVE_STATFS_H
 
-/* No mounting table on *BSD
- * This information is stored only in the kernel. */
-/* static const sal_Char* MOUNTTAB=/etc/mtab; */
-
 #elif defined(MACOSX)
 
 #include sys/param.h
 #include sys/mount.h
 #define HAVE_STATFS_H
-// static const sal_Char* MOUNTTAB=/etc/mtab;
 
 #endif /* HAVE_STATFS_H */
 
@@ -360,42 +353,6 @@ static oslFileError osl_psz_getVolumeInformation (
  *
  */
 
-
-/*
- * osl_unmountVolumeDevice
- /
-
-oslFileError osl_unmountVolumeDevice( oslVolumeDeviceHandle Handle )
-{
-oslFileError tErr = osl_File_E_NOSYS;
-
- /* Perhaps current working directory is set to mount point */
-
- if ( tErr )
-{
-sal_Char *pszHomeDir = getenv(HOME);
-
-if ( pszHomeDir  strlen( pszHomeDir )  0 == chdir( pszHomeDir ) )
-{
-/* try again */
-OSL_ENSURE( tErr, osl_unmountVolumeDevice: CWD was set to volume 
mount point );
-}
-}
-
-return tErr;
-}
-
-/*
- * osl_automountVolumeDevice
- /
-
-oslFileError osl_automountVolumeDevice( oslVolumeDeviceHandle Handle )

[Libreoffice-commits] .: solenv/gbuild

2012-02-05 Thread Norbert Thiebaud 
 solenv/gbuild/extensions/post_BuildplTargets.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a08ed74f4da656f94eae1cc293073faaa937a89
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun Feb 5 20:35:07 2012 -0600

we can't use WORKDIR directly, on windows this is windows path

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 332e0d4..1ba2ffb 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,7 +27,7 @@
 
 .PHONY: cross-build-toolset dev-install build findunusedcode
 
-$(WORKDIR)/bootstrap:
+$(SRCDIR)/workdir/$(INPATH)/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] .: Makefile

2012-02-05 Thread Norbert Thiebaud 
 Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 993cdce1f0194433cfa5bfa1a88d38b52e8a9240
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun Feb 5 20:43:10 2012 -0600

again do not use WORKDIR prematurely due to windows

diff --git a/Makefile b/Makefile
index 3cab806..a701b50 100644
--- a/Makefile
+++ b/Makefile
@@ -353,7 +353,7 @@ config_host.mk : config_host.mk.in bin/repo-list.in 
ooo.lst.in configure.in auto
 # Bootstap
 #
 
-bootstrap: $(WORKDIR)/bootstrap
+bootstrap: $(SRCDIR)/workdir/$(INPATH)/bootstrap
 
 #
 # Fetch
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2012-02-05 Thread Norbert Thiebaud 
 solenv/gbuild/extensions/post_BuildplTargets.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 81e9525305cfe2b9455dadceeda0710e0176448c
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun Feb 5 21:00:54 2012 -0600

still invalid use of WORKDIR in top level Makefile

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 1ba2ffb..8bd3151 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -110,7 +110,7 @@ endef
 
 # the build order dependencies are rather ugly...
 dev-install: \
-   $(WORKDIR)/bootstrap \
+   $(SRCDIR)/workdir/$(INPATH)/bootstrap \
$(SRCDIR)/src.downloaded \
$(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \
|   $(filter build,$(MAKECMDGOALS)) \
@@ -177,11 +177,11 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
 
-dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
+dev-install: $(SRCDIR)/workdir/$(INPATH)/bootstrap  $(SRCDIR)/src.downloaded 
$(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter 
build,$(MAKECMDGOALS))
 
-build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
+build: $(SRCDIR)/workdir/$(INPATH)bootstrap $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 
-cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+cross_toolset: $(SRCDIR)/workdir/$(INPATH)/bootstrap $(SRCDIR)/src.downloaded
 
 findunusedcode:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bridges/README cli_ure/README codemaker/README cppuhelper/README cppu/README cpputools/README idlc/README io/README javaunohelper/README jurt/README jvmaccess/README jvmfwk/RE

2012-02-05 Thread Michael Meeks 
 bridges/README   |4 
 cli_ure/README   |5 +
 codemaker/README |2 ++
 cppu/README  |4 
 cppuhelper/README|4 
 cpputools/README |1 +
 idlc/README  |2 ++
 io/README|2 ++
 javaunohelper/README |2 ++
 jurt/README  |2 ++
 jvmaccess/README |1 +
 jvmfwk/README|1 +
 offapi/README|4 
 pyuno/README |1 +
 rdbmaker/README  |4 
 registry/README  |1 +
 remotebridges/README |1 +
 ridljar/README   |1 +
 sal/README   |9 +
 salhelper/README |1 +
 stoc/README  |1 +
 store/README |1 +
 udkapi/README|6 ++
 unoil/README |1 +
 ure/README   |   10 ++
 xml2cmp/README   |3 +++
 26 files changed, 74 insertions(+)

New commits:
commit fb78dbcdc5a76997856285af3b041ffd087c40a5
Author: Josh Heidenreich josh.sickm...@gmail.com
Date:   Mon Feb 6 13:22:05 2012 +1030

Added READMEs for modules related to URE, with content from the wiki

diff --git a/bridges/README b/bridges/README
new file mode 100644
index 000..7c0eee3
--- /dev/null
+++ b/bridges/README
@@ -0,0 +1,4 @@
+Bridges from various C++ ABIs, Java JNI, MS .Net to UNO and back.
+
+Also implementation of the UNO Remote Protocol. And in ooo-build a bridge from 
Mono to UNO and back.
+
diff --git a/cli_ure/README b/cli_ure/README
new file mode 100644
index 000..8f173df
--- /dev/null
+++ b/cli_ure/README
@@ -0,0 +1,5 @@
+Common Lang Infrastructure Uno Runtime Environment - support assemblies and 
tools for the MS .Net (and Mono) UNO binding.
+
+See also:
+[git:cli_ure/source/readme.txt]
+
diff --git a/codemaker/README b/codemaker/README
new file mode 100644
index 000..96a08ac
--- /dev/null
+++ b/codemaker/README
@@ -0,0 +1,2 @@
+UNO interface declaration/stub generators for C++ (headers), Java (class 
files), ... the one for .Net is in cli_ure.
+
diff --git a/cppu/README b/cppu/README
new file mode 100644
index 000..0baacca
--- /dev/null
+++ b/cppu/README
@@ -0,0 +1,4 @@
+Type definitions/implementations for the core of UNO. The exported API is in C.
+
+See also:
+[http://wiki.services.openoffice.org/wiki/Uno/Binary/Modules/CPPU]
diff --git a/cppuhelper/README b/cppuhelper/README
new file mode 100644
index 000..f69652c
--- /dev/null
+++ b/cppuhelper/README
@@ -0,0 +1,4 @@
+Helpers for using cppu in C++, e.g. templates for implementing UNO components, 
bootstrapping stuff. Get UNO up and running.
+
+See also:
+[http://wiki.services.openoffice.org/wiki/Uno/Cpp/Modules/CPPUhelper]
diff --git a/cpputools/README b/cpputools/README
new file mode 100644
index 000..9652827
--- /dev/null
+++ b/cpputools/README
@@ -0,0 +1 @@
+Old way of doing component registration. Nowadays replaced by another 
stand-alone UI and tools called UNO package. 
diff --git a/idlc/README b/idlc/README
new file mode 100644
index 000..877702a
--- /dev/null
+++ b/idlc/README
@@ -0,0 +1,2 @@
+Contains the IDL compiler.
+
diff --git a/io/README b/io/README
new file mode 100644
index 000..b721ef4
--- /dev/null
+++ b/io/README
@@ -0,0 +1,2 @@
+Simple IO wrappers.
+
diff --git a/javaunohelper/README b/javaunohelper/README
new file mode 100644
index 000..9896ef1
--- /dev/null
+++ b/javaunohelper/README
@@ -0,0 +1,2 @@
+Makes it easier to use UNO with Java.
+
diff --git a/jurt/README b/jurt/README
new file mode 100644
index 000..a2281d2
--- /dev/null
+++ b/jurt/README
@@ -0,0 +1,2 @@
+JURT means Java Uno Runtime and implements most of Java UNO.
+
diff --git a/jvmaccess/README b/jvmaccess/README
new file mode 100644
index 000..54af224
--- /dev/null
+++ b/jvmaccess/README
@@ -0,0 +1 @@
+Wrappers so you can use all the Java Runtime Environments with their slightly 
incompatible APIs with more ease.
diff --git a/jvmfwk/README b/jvmfwk/README
new file mode 100644
index 000..54af224
--- /dev/null
+++ b/jvmfwk/README
@@ -0,0 +1 @@
+Wrappers so you can use all the Java Runtime Environments with their slightly 
incompatible APIs with more ease.
diff --git a/offapi/README b/offapi/README
new file mode 100644
index 000..c33424d
--- /dev/null
+++ b/offapi/README
@@ -0,0 +1,4 @@
+Contains all of the IDL files except those in [[udkapi]]
+
+i.e. the interfaces that are specific to the OppenOffice.org application.
+An artificial (?) separation.
diff --git a/pyuno/README b/pyuno/README
new file mode 100644
index 000..57853a9
--- /dev/null
+++ b/pyuno/README
@@ -0,0 +1 @@
+UNO bindings for the Python programming language.
diff --git a/rdbmaker/README b/rdbmaker/README
new file mode 100644
index 000..56f48a8
--- /dev/null
+++ b/rdbmaker/README
@@ -0,0 +1,4 @@
+Makes registries for openoffice for storing type data
+
+See also:
+[http://wiki.services.openoffice.org/wiki/Uno/Binary/Modules/rdbmaker]
diff --git a/registry/README b/registry/README
new file mode 100644
index 000..b455809
---

[Libreoffice-commits] .: configure.in

2012-02-05 Thread Norbert Thiebaud 
 configure.in |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 015713cd664b905b7090816db0e67b1b17df183e
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Feb 6 00:37:01 2012 -0600

typo in the export of WIN_* variables

diff --git a/configure.in b/configure.in
index 8341d6c..a44f2d7 100644
--- a/configure.in
+++ b/configure.in
@@ -10753,10 +10753,10 @@ AC_SUBST(ATL_INCLUDE)
 AC_SUBST(ATL_LIB)
 AC_SUBST(MFC_INCLUDE)
 AC_SUBST(MFC_LIB)
-AC_SUBST(WIND_FIND)
-AC_SUBST(WIND_GREP)
-AC_SUBST(WIND_LS)
-AC_SUBST(WIND_TOUCH)
+AC_SUBST(WIN_FIND)
+AC_SUBST(WIN_GREP)
+AC_SUBST(WIN_LS)
+AC_SUBST(WIN_TOUCH)
 
 AC_SUBST(BUILD_TYPE)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits