[Libreoffice-commits] .: sc/inc sc/source unusedcode.easy
sc/inc/nameuno.hxx |5 -
sc/source/ui/unoobj/nameuno.cxx |8
unusedcode.easy |1 -
3 files changed, 14 deletions(-)
New commits:
commit 0dbda27fb81bc063c865a6829fb035322fd77035
Author: Julien Nabet
Date: Thu Feb 2 23:18:07 2012 +0100
Remove things not used
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index a83748c..ee66e26 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -173,11 +173,6 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException);
-
-// methods accessible via getImplementation()
-voidSetContentWithGrammar( const ::rtl::OUString&
aContent,
-const formula::FormulaGrammar::Grammar
eGrammar )
-throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index efb00e6..48baee8 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -265,14 +265,6 @@ void SAL_CALL ScNamedRangeObj::setContent( const
rtl::OUString& aContent )
Modify_Impl( NULL, NULL, &aContStr, NULL,
NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
}
-void ScNamedRangeObj::SetContentWithGrammar( const ::rtl::OUString& aContent,
-const formula::FormulaGrammar::Grammar
eGrammar )
-throw(::com::sun::star::uno::RuntimeException)
-{
-String aContStr(aContent);
-Modify_Impl( NULL, NULL, &aContStr, NULL, NULL, eGrammar );
-}
-
table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition()
throw(uno::RuntimeException)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 15364fe..28a91d7 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -176,7 +176,6 @@ ScMyCellInfo::ScMyCellInfo()
ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short,
rtl::OUString const*, ScXMLImport&)
ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*,
short, rtl::OUString const*, ScXMLImport&)
ScNameDefDlg::LinkStubEdModifyHdl(void*, void*)
-ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const&,
formula::FormulaGrammar::Grammar)
ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference)
ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source svx/source
framework/source/accelerators/globalacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/moduleacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/presethandler.cxx | 12
+-
framework/source/services/autorecovery.cxx | 10
svx/source/unodraw/unoshcol.cxx |4 +--
5 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit f58c49b39a7c6a8490033360f78768ee0a26f167
Author: Julien Nabet
Date: Thu Feb 2 22:53:48 2012 +0100
Some cppcheck cleaning
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 84da269..c5853f8 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -119,8 +119,8 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster->addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException& exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException&)
+{ throw; }
catch(const css::uno::Exception&)
{}
}
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 9c3fb8f..7100685 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -153,8 +153,8 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster->addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException& exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException&)
+{ throw; }
catch(const css::uno::Exception&)
{}
}
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index d276b48..b68fdc4 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -501,8 +501,8 @@ void PresetHandler::connectToResource(
PresetHandler::EConfigType
xUser = m_lDocumentStorages.openPath(sRelPathUser , eUserMode
);
xShare = xUser;
}
-catch(const css::uno::RuntimeException& exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException&)
+{ throw; }
catch(const css::uno::Exception&)
{ xShare.clear(); xUser.clear(); }
}
@@ -822,8 +822,8 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::impl_openPathIgnoring
else
xPath = m_aSharedStorages->m_lStoragesUser.openPath(sPath, eMode);
}
-catch(const css::uno::RuntimeException& exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException&)
+{ throw; }
catch(const css::uno::Exception&)
{ xPath.clear(); }
return xPath;
@@ -921,8 +921,8 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::impl_openLocalizedPat
if (xFolder->isStorageElement(pNames[i]))
lSubFolders.push_back(pNames[i]);
}
-catch(const css::uno::RuntimeException& exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException&)
+{ throw; }
catch(const css::uno::Exception&)
{}
}
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 6d2b6b6..cae935b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1336,7 +1336,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo& rIn
nRetry = 0;
}
-catch(const css::uno::Exception& ex)
+catch(const css::uno::Exception&)
{
// a) FULL DISC seams to be the problem behind
=> show error and retry it forever (e.g. retry=300)
// b) unknown problem (may be locking problem)
=> reset RETRY value to more usefull value(!) (e.g. retry=3)
@@ -1355,7 +1355,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo& rIn
nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
else
if (nRetry <= GIVE_UP_RETRY)
-throw ex; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
+throw; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
--nRetry;
}
@@ -2374,7 +2374,
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/dtrans/config.cxx |2 +-
vcl/unx/generic/printer/cupsmgr.cxx|6 +++---
vcl/unx/generic/printer/jobdata.cxx|2 +-
vcl/unx/generic/printer/ppdparser.cxx | 20 ++--
vcl/unx/generic/printer/printerinfomanager.cxx | 18 +-
vcl/unx/generic/window/salframe.cxx|8
vcl/unx/gtk/a11y/atktext.cxx |6 +++---
vcl/unx/gtk/a11y/atktextattributes.cxx |4 ++--
vcl/unx/gtk/app/gtkdata.cxx|2 +-
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 18 +-
vcl/unx/gtk/fpicker/SalGtkPicker.cxx |4 ++--
vcl/unx/gtk/window/gtkframe.cxx|4 ++--
12 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit beccf7c9dd4966347fa31e11922fd73bd40dfeb9
Author: Olivier Hallot
Date: Wed Feb 1 12:16:11 2012 -0200
Fix for fdo43460 Part LIX getLength() to isEmpty()
Part LIX
Modules
vcl (part 3)
diff --git a/vcl/unx/generic/dtrans/config.cxx
b/vcl/unx/generic/dtrans/config.cxx
index f6e71ff..7d83f5e 100644
--- a/vcl/unx/generic/dtrans/config.cxx
+++ b/vcl/unx/generic/dtrans/config.cxx
@@ -95,7 +95,7 @@ DtransX11ConfigItem::DtransX11ConfigItem() :
if( pValue->getValueTypeClass() == TypeClass_STRING )
{
const OUString* pLine = (const OUString*)pValue->getValue();
-if( pLine->getLength() )
+if( !pLine->isEmpty() )
{
m_nSelectionTimeout = pLine->toInt32();
if( m_nSelectionTimeout < 1 )
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 85c2e74..a0e020a 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -291,7 +291,7 @@ struct GetPPDAttribs
~GetPPDAttribs()
{
-if( m_aResult.getLength() )
+if( !m_aResult.isEmpty() )
unlink( m_aResult.getStr() );
}
@@ -646,7 +646,7 @@ void CUPSManager::initialize()
if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() )
continue;
-if( it->second.m_aInfo.m_aFeatures.getLength() > 0 )
+if( !it->second.m_aInfo.m_aFeatures.isEmpty() )
continue;
aRemovePrinters.push_back( it->first );
}
@@ -732,7 +732,7 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString& rPrinter )
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "PPD for %s is %s\n", OUStringToOString(
aPrinter, osl_getThreadTextEncoding() ).getStr(), aPPDFile.getStr() );
#endif
-if( aPPDFile.getLength() )
+if( !aPPDFile.isEmpty() )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
OUString aFileName( OStringToOUString( aPPDFile, aEncoding
) );
diff --git a/vcl/unx/generic/printer/jobdata.cxx
b/vcl/unx/generic/printer/jobdata.cxx
index bb059f0..9bd1d57 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -54,7 +54,7 @@ JobData& JobData::operator=(const JobData& rRight)
m_nPDFDevice= rRight.m_nPDFDevice;
m_nColorDevice = rRight.m_nColorDevice;
-if( ! m_pParser && m_aPrinterName.getLength() )
+if( !m_pParser && !m_aPrinterName.isEmpty() )
{
PrinterInfoManager& rMgr = PrinterInfoManager::get();
rMgr.setupJobContextData( *this );
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 98bf630..fdb0f4e 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -138,7 +138,7 @@ namespace psp
)
{
com::sun::star::lang::Locale aLoc( i_rLocale );
-if( bInsertDefault && aLoc.Language.getLength() == 0 )
+if( bInsertDefault && aLoc.Language.isEmpty() )
{
// empty locale requested, fill in application UI locale
aLoc = Application::GetSettings().GetUILocale();
@@ -175,17 +175,17 @@ namespace psp
{
rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() +
i_rValue.getLength() + 2 );
aKey.append( i_rKey );
-if( i_rOption.getLength() || i_rValue.getLength() )
+if( !i_rOption.isEmpty() || !i_rValue.isEmpty() )
{
aKey.append( sal_Unicode( ':' ) );
aKey.append( i_rOption );
}
-if( i_rValue.getLength() )
+if( !i_rValue.isEmpty() )
{
aKey.append( sal_Unicode( ':' ) );
aKey.append( i_rValue );
}
-if( aKey.getLength() && i_rTranslation.getLength() )
+if( aKey.getLength() && !i_rTranslation.isEmpty() )
{
rtl::OUString aK( aKey.makeStringAndClear() );
com::sun::star::la
[Libreoffice-commits] .: configure.in
configure.in | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) New commits: commit 4cb33a7db765f8ad06e65d24a2396f2857a9cf0d Author: Lionel Elie Mamane Date: Thu Feb 2 22:49:28 2012 +0100 make --with-system-libs behave as documented make it enable --with-system-headers and --with-system-jars also fixup lucene-analyzers.jar search path diff --git a/configure.in b/configure.in index 61d9bfa..6009518 100644 --- a/configure.in +++ b/configure.in @@ -998,15 +998,15 @@ AC_ARG_WITH(system-headers, AS_HELP_STRING([--with-system-headers], [Use headers already on system -- enables all --with-system-* flags for external packages whose headers are the only entities used i.e. - boost/vigra/odbc/sane-header(s).]), -,) + boost/vigra/odbc/sane-header(s).]),, +[with_system_headers="$with_system_libs"]) AC_ARG_WITH(system-jars, AS_HELP_STRING([--without-system-jars], [When building with --with-system-libs, also the needed jars are expected on the system. Use this to disable that (except for the db case where - --with-system-db *has to* imply using the db.jar from there, too).]), -,) + --with-system-db *has to* imply using the db.jar from there, too).]),, +[with_system_jars="$with_system_libs"]) AC_ARG_WITH(system-stdlibs, AS_HELP_STRING([--with-system-stdlibs], @@ -1107,8 +1107,8 @@ AC_ARG_WITH(system-libcmis, AC_ARG_WITH(system-libcdr, AS_HELP_STRING([--with-system-libcdr], -[Use libvisio already on system.]),, -[with_system_libcdr="no"]) +[Use libcdr already on system.]),, +[with_system_libcdr="$with_system_libs"]) AC_ARG_WITH(system-libvisio, AS_HELP_STRING([--with-system-libvisio], @@ -5930,7 +5930,11 @@ if test "$with_system_lucene" = "yes"; then [ AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar, [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar ], -[ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)] +[ AC_CHECK_FILE(/usr/share/java/lucene-analyzers.jar, + [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers.jar ], + [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)] + ) +] ) ] ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source
connectivity/source/drivers/postgresql/makefile.mk |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 88b58e961324ff69feaec24fdc3fd03cd6f684ca Author: Lionel Elie Mamane Date: Thu Feb 2 21:34:38 2012 +0100 pgsql-sdbc: move libpq link *first* in libs; hopefully will fix tinderboxes diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index d4df775..acf8b8c 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -155,13 +155,13 @@ LIB2OBJFILES= \ SHL2STDLIBS= \ +$(POSTGRESQL_LIB) \ +$(LIBPQ_LINK) \ +$(LIBPQ_DEP_LIBS) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ -$(SALHELPERLIB)\ -$(POSTGRESQL_LIB) \ -$(LIBPQ_LINK) \ -$(LIBPQ_DEP_LIBS) +$(SALHELPERLIB) SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)/$(SHL2TARGET).def commit c39cec2f91205529cef237e6bae500bbaf169517 Author: Lionel Elie Mamane Date: Thu Feb 2 21:20:11 2012 +0100 pgsql-sdbc: libpq dependencies *after* libpq seems to be the right after all diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 8a831a6..d4df775 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -160,8 +160,8 @@ SHL2STDLIBS= \ $(SALLIB) \ $(SALHELPERLIB)\ $(POSTGRESQL_LIB) \ -$(LIBPQ_DEP_LIBS) \ -$(LIBPQ_LINK) +$(LIBPQ_LINK) \ +$(LIBPQ_DEP_LIBS) SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)/$(SHL2TARGET).def ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/about.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 38ce8bbbd13ff031943052865c072e86f67ef4ee Author: Michael Stahl Date: Thu Feb 2 20:12:40 2012 +0100 cui: about.cxx: nSpace was not declared in this scope diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0b0ae4a..e1f13b1 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -251,7 +251,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : aLTSize = aInfoLink.CalcMinimumSize(); aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2; -aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nSpace; +aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nLineSpace; aInfoLink.SetPosSizePixel( aLTPnt, aLTSize ); nY += aLTSize.Height() + nLineSpace; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/borderline.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 971f826a96f0938bfcfd8dfe26edd50d8e031bb4
Author: Eike Rathke
Date: Thu Feb 2 19:11:37 2012 +0100
resolved fdo#42784 BorderLine with only InnerWidth set does not work
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 8d073c6..b617ff4 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -298,6 +298,22 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
else
{
SetStyle( nStyle );
+if (nOut == 0 && nIn > 0)
+{
+// If only inner width is given swap inner and outer widths for
+// single line styles, otherwise GuessWidth() marks this as invalid
+// and returns a 0 width.
+switch (nStyle)
+{
+case SOLID:
+case DOTTED:
+case DASHED:
+::std::swap( nOut, nIn);
+break;
+default:
+; // nothing
+}
+}
m_nWidth = m_aWidthImpl.GuessWidth( nOut, nIn, nDist );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source svl/inc svl/source sw/source
cui/source/dialogs/insdlg.cxx |4 +-
svl/inc/svl/ownlist.hxx| 17 +-
svl/source/misc/ownlist.cxx| 64 +
sw/source/ui/shells/textsh.cxx |2 -
4 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit f439dde9be6e269903dfd65fb63a786fcaba3971
Author: Takeshi Abe
Date: Fri Feb 3 02:34:17 2012 +0900
Replaced String by rtl::OUString
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 5312e6f..2ff622b 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -468,7 +468,7 @@ SvInsertPlugInDialog::~SvInsertPlugInDialog()
static void Plugin_ImplFillCommandSequence( const String& aCommands,
uno::Sequence< beans::PropertyValue >& aCommandSequence )
{
-sal_uInt16 nEaten;
+sal_Int32 nEaten;
SvCommandList aLst;
aLst.AppendCommands( aCommands, &nEaten );
@@ -478,7 +478,7 @@ static void Plugin_ImplFillCommandSequence( const String&
aCommands, uno::Sequen
{
aCommandSequence[nIndex].Name = aLst[ nIndex ].GetCommand();
aCommandSequence[nIndex].Handle = -1;
-aCommandSequence[nIndex].Value = makeAny( OUString( aLst[ nIndex
].GetArgument() ) );
+aCommandSequence[nIndex].Value = makeAny( aLst[ nIndex ].GetArgument()
);
aCommandSequence[nIndex].State = beans::PropertyState_DIRECT_VALUE;
}
}
diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index f0fd246..fb14002 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -30,7 +30,6 @@
#define _OWNLIST_HXX
#include "svl/svldllapi.h"
-#include
#include
#include
@@ -50,17 +49,17 @@ class SvCommand
aus: Kommando = Argument.
*/
{
-String aCommand;
-String aArgument;
+::rtl::OUString aCommand;
+::rtl::OUString aArgument;
public:
SvCommand() {}
-SvCommand( const String & rCommand, const String & rArg )
+SvCommand( const ::rtl::OUString & rCommand, const ::rtl::OUString & rArg )
{
aCommand = rCommand;
aArgument = rArg;
}
-const String & GetCommand() const { return aCommand; }
-const String & GetArgument() const { return aArgument; }
+const ::rtl::OUString & GetCommand() const { return aCommand; }
+const ::rtl::OUString & GetArgument() const { return aArgument; }
};
typedef ::std::vector< SvCommand > SvCommandList_impl;
@@ -78,10 +77,10 @@ private:
SvCommandList_impl aCommandList;
public:
-SvCommand& Append( const String & rCommand, const String & rArg );
-sal_BoolAppendCommands( const String & rCmd, sal_uInt16 * pEaten );
+SvCommand& Append( const ::rtl::OUString & rCommand, const
::rtl::OUString & rArg );
+boolAppendCommands( const ::rtl::OUString & rCmd, sal_Int32 *
pEaten );
-sal_Bool FillFromSequence( const com::sun::star::uno::Sequence <
com::sun::star::beans::PropertyValue >& );
+bool FillFromSequence( const com::sun::star::uno::Sequence <
com::sun::star::beans::PropertyValue >& );
void FillSequence( com::sun::star::uno::Sequence <
com::sun::star::beans::PropertyValue >& );
size_t size() const { return aCommandList.size(); }
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 51f0707..156fe5b 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -38,45 +38,47 @@ using namespace com::sun::star;
//== SvCommandList
//=
-static String parseString(const String & rCmd, sal_uInt16 * pIndex)
+static ::rtl::OUString parseString(const ::rtl::OUString & rCmd, sal_Int32 *
pIndex)
{
-String result;
+::rtl::OUString result;
-if(rCmd.GetChar( *pIndex ) == '\"') {
+if(rCmd[*pIndex] == sal_Unicode('\"')) {
(*pIndex) ++;
-sal_uInt16 begin = *pIndex;
+sal_Int32 begin = *pIndex;
-while(*pIndex < rCmd.Len() && rCmd.GetChar((*pIndex) ++) != '\"') ;
+while(*pIndex < rCmd.getLength() && rCmd[(*pIndex) ++] !=
sal_Unicode('\"')) ;
-result = String(rCmd.Copy(begin, *pIndex - begin - 1));
+result = rCmd.copy(begin, *pIndex - begin - 1);
}
return result;
}
-static String parseWord(const String & rCmd, sal_uInt16 * pIndex)
+static ::rtl::OUString parseWord(const ::rtl::OUString & rCmd, sal_Int32 *
pIndex)
{
-sal_uInt16 begin = *pIndex;
+sal_Int32 begin = *pIndex;
-while(*pIndex < rCmd.Len() && !isspace(rCmd.GetChar(*pIndex)) &&
rCmd.GetChar(*pIndex) != '=')
+while(*pIndex < rCmd.getLength()
+ && !isspace(sal::static_int_cast(rCmd[*pIndex]))
+ && rCmd[*pIndex] != sal_Unicode('='))
(*pIndex) ++;
-return String(rCmd.Copy(begin, *pIndex - begin));
+return
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/makefile.mk |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 1f741dfeeab848424b91420390d2853572056e00 Author: Lionel Elie Mamane Date: Thu Feb 2 18:37:49 2012 +0100 pgsql-sdbc: put libs libpq needs *before* libpq in the link line diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 3900d21..8a831a6 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -88,14 +88,13 @@ LIBPQ_DEP_LIBS += \ LIBPQ_DEP_LIBS+=\ $(LDAPSDKLIB) .ENDIF -.ELSE +.ELSE # "$(GUI)$(COM)"!="WNTMSC" LIBPQ_LINK=$(OUTDIR)/lib/libpq.a LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--as-needed) .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed) .ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql -POSTGRESQL_LIB= .ENDIF # SYSTEM_POSTGRESQL CFLAGS+=$(POSTGRESQL_INC) \ @@ -161,8 +160,8 @@ SHL2STDLIBS= \ $(SALLIB) \ $(SALHELPERLIB)\ $(POSTGRESQL_LIB) \ -$(LIBPQ_LINK) \ -$(LIBPQ_DEP_LIBS) +$(LIBPQ_DEP_LIBS) \ +$(LIBPQ_LINK) SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)/$(SHL2TARGET).def ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/about.cxx | 43 ++-
cui/source/dialogs/about.hrc | 27 +++
cui/source/dialogs/about.src | 34 ++
cui/source/inc/about.hxx |5 -
4 files changed, 75 insertions(+), 34 deletions(-)
New commits:
commit dde025efacba24edc700989a357c5fddbb0e4886
Author: dbarisakkurt
Date: Thu Feb 2 16:12:46 2012 +
I added some links and removed the ok button
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 70648a0..0b0ae4a 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -101,16 +101,18 @@ GetBuildId()
AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
SfxModalDialog ( pParent, rId ),
-
-aOKButton ( this, ResId( ABOUT_BTN_OK, *rId.GetResMgr() ) ),
aVersionText( this, ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() )
),
aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr()
) ),
aInfoLink ( this, ResId( ABOUT_FTXT_LINK, *rId.GetResMgr() ) ),
+aTdfLink( this, ResId( ABOUT_TDFSTR_LINK, *rId.GetResMgr() ) ),
+aFeaturesLink ( this, ResId( ABOUT_FEATURES_LINK, *rId.GetResMgr() )
),
aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())),
m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
m_aOracleCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT_ORACLE_DERIVED,
*rId.GetResMgr())),
m_aAcknowledgementTextStr(ResId(ABOUT_STR_ACKNOWLEDGEMENT,
*rId.GetResMgr())),
m_aLinkStr(ResId( ABOUT_STR_LINK, *rId.GetResMgr())),
+m_aTdfLinkStr(ResId( ABOUT_TDF_LINK, *rId.GetResMgr())),
+m_aFeaturesLinkStr(ResId( ABOUT_FEATURESSTR_LINK, *rId.GetResMgr())),
m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr()))
{
// load image from module path
@@ -152,12 +154,19 @@ AboutDialog::AboutDialog( Window* pParent, const ResId&
rId) :
aInfoLink.SetBackground();
aInfoLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
+aTdfLink.SetURL(m_aTdfLinkStr);
+aTdfLink.SetBackground();
+aTdfLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
+
+aFeaturesLink.SetURL(m_aFeaturesLinkStr);
+aFeaturesLink.SetBackground();
+aFeaturesLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
+
Color aTextColor( rSettings.GetWindowTextColor() );
aVersionText.SetControlForeground( aTextColor );
aCopyrightText.SetControlForeground( aTextColor );
rtl::OUStringBuffer sText(m_aVendorTextStr);
-sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
sal_uInt32 nCopyrightId =
utl::ConfigManager::getProductName().equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("LibreOffice"))
@@ -223,23 +232,31 @@ AboutDialog::AboutDialog( Window* pParent, const ResId&
rId) :
nY += aCTSize.Height() + nCtrlMargin;
+const int nLineSpace = 4;
// FixedHyperlink with more info link
-Size aLTSize = aInfoLink.CalcMinimumSize();
+Size aLTSize = aTdfLink.CalcMinimumSize();
Point aLTPnt;
aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2;
aLTPnt.Y() = nY;
-aInfoLink.SetPosSizePixel( aLTPnt, aLTSize );
+aTdfLink.SetPosSizePixel( aLTPnt, aLTSize );
+
+nY += aLTSize.Height();
-nY += aLTSize.Height() + nCtrlMargin;
+aLTSize = aFeaturesLink.CalcMinimumSize();
+aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2;
+aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nLineSpace;
+aFeaturesLink.SetPosSizePixel( aLTPnt, aLTSize );
+
+nY += aLTSize.Height() + nLineSpace;
+
+aLTSize = aInfoLink.CalcMinimumSize();
+aLTPnt.X() = ( aOutSiz.Width() - aLTSize.Width() ) / 2;
+aLTPnt.Y() = aLTPnt.Y() + aLTSize.Height() + nSpace;
+aInfoLink.SetPosSizePixel( aLTPnt, aLTSize );
-// OK-Button-Position (at the bottom and centered)
-Size aOKSiz = aOKButton.GetSizePixel();
-Point aOKPnt;
-aOKPnt.X() = ( aOutSiz.Width() - aOKSiz.Width() ) / 2;
-aOKPnt.Y() = nY;
-aOKButton.SetPosPixel( aOKPnt );
+nY += aLTSize.Height() + nLineSpace;
-nY += aOKSiz.Height() + nCtrlMargin;
+nY += nCtrlMargin;
aOutSiz.Height() = nY;
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index fe31423..9e480e9 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -27,15 +27,18 @@
#include
-#define ABOUT_BTN_OK1
-#define ABOUT_FTXT_VERSION 2
-#define ABOUT_FTXT_COPYRIGHT3
-#define ABOUT_FTXT_LINK 4
-#define ABOUT_STR_BUILD 5
-#define ABOUT_STR_VERSION 6
-#define ABOUT_STR_VENDOR7
-#define ABOUT_STR_COPYRIGHT 8
-#define ABOUT_STR_COPYRIGHT_DERIVED 9
-#define ABOUT_STR_COPYRIGHT_ORACLE_DERIVED 10
-#define ABOUT_STR_ACKNOWLEDGEMENT 11
-#define ABOUT_STR_LINK 12
+#define ABOUT_FTXT_VERSION 1
+#define ABOUT_FTXT_COPYRIGHT2
+#define ABOUT_FTXT_LINK 3
+#defin
[Libreoffice-commits] .: 3 commits - basctl/Module_basctl.mk configure.in connectivity/qa
basctl/Module_basctl.mk|5 - configure.in |6 ++ connectivity/qa/connectivity/tools/makefile.mk |8 ++-- connectivity/qa/makefile.mk|4 +++- 4 files changed, 19 insertions(+), 4 deletions(-) New commits: commit e52c70e051c41a1832fdc771d3c5fcdc82c96726 Author: Tor Lillqvist Date: Thu Feb 2 18:13:25 2012 +0200 Look for Xcode 3 also in /Xcode3 where I have it ;) diff --git a/configure.in b/configure.in index 2fb8d28..61d9bfa 100644 --- a/configure.in +++ b/configure.in @@ -2113,6 +2113,9 @@ if test "$_os" = "Darwin" ; then if test ! -d "$MACOSX_SDK_PATH"; then MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk" fi +if test ! -d "$MACOSX_SDK_PATH"; then + MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" +fi macosx_sdk_value="1040" ;; 10.5) @@ -2120,6 +2123,9 @@ if test "$_os" = "Darwin" ; then if test ! -d "$MACOSX_SDK_PATH"; then MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk" fi +if test ! -d "$MACOSX_SDK_PATH"; then + MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" +fi macosx_sdk_value="1050" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) echo "Building with a SDK > 10.4 is experimental" >> warn commit 6ab3556b44daef93f8a504592ae1decafcd0cfe0 Author: Tor Lillqvist Date: Thu Feb 2 18:12:02 2012 +0200 Do Package_xml also for iOS so that packimages doesn't fail diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 22bf325..b61cbcd 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -33,9 +33,12 @@ ifneq (IOS,$(OS)) $(eval $(call gb_Module_add_targets,basctl,\ AllLangResTarget_basctl \ Library_basctl \ - Package_xml \ )) endif +$(eval $(call gb_Module_add_targets,basctl,\ + Package_xml \ +)) + # vim: set noet sw=4 ts=4: commit aa5404b92f99541ecfe0b95168e80d705d0fc111 Author: Tor Lillqvist Date: Thu Feb 2 17:55:48 2012 +0200 Silence a few lines of pointless verbiage diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index 897a85f..4cd76ff 100755 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -34,13 +34,17 @@ PACKAGE = connectivity/tools .INCLUDE: settings.mk .IF "$(SOLAR_JAVA)" == "" + all: -@echo "Java not available. Build skipped" +# nothing + .ELSE .IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" + all: -@echo "QADEVOO not set. Build skipped" +# nothing + .ELSE #- compile .java files - diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index 76028ad..c3179d5 100755 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -34,8 +34,10 @@ PACKAGE = complex/connectivity .INCLUDE: settings.mk .IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" + all: -@echo "QADEVOO not set. Build skipped" +# nothing + .ELSE #- compile .java files - ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8a0b87ff6b4a7383c9a5b2ca6f5f435c66942b24 Author: Markus Mohrhard Date: Thu Feb 2 00:54:35 2012 +0100 increase the sleep time of the Mozilla UI Thread Signed-off-by: Kohei Yoshida diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index d80ac4e..e9d8222 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -231,8 +231,8 @@ void MNS_XPCOM_EventLoop() if (NS_FAILED(rv)) return ; if (event) -eventQ->HandleEvent(event); -}while ( PR_SUCCESS == PR_Sleep( PR_MillisecondsToInterval(1)) && aLive ); +eventQ->HandleEvent(event); +}while ( PR_SUCCESS == PR_Sleep( PR_MillisecondsToInterval(20)) && aLive ); eventQ->ProcessPendingEvents(); OSL_TRACE( "OUT : MNS_XPCOM_EventLoop()" ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |1 + 1 file changed, 1 insertion(+) New commits: commit 41a3c8f14a4a8d3bbdc1fde31536e76f78003cd0 Author: Lionel Elie Mamane Date: Thu Feb 2 15:52:39 2012 +0100 configure.in: properly close case diff --git a/configure.in b/configure.in index 9335fdd..2fb8d28 100644 --- a/configure.in +++ b/configure.in @@ -6162,6 +6162,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) fi +;; *) if test "$with_krb5" = "yes"; then WITH_KRB5=YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 17 + 1 file changed, 13 insertions(+), 4 deletions(-) New commits: commit 0c064e0303ed5e2f4961cc590f62bcb2151b Author: Lionel Elie Mamane Date: Thu Feb 2 15:47:12 2012 +0100 postgresql: enable Kerberos&GSSAPI on GNU/Linux and *BSD It is part of the default/core install of (the major distributions of) these OSs diff --git a/configure.in b/configure.in index a1b2c09..9335fdd 100644 --- a/configure.in +++ b/configure.in @@ -1669,10 +1669,6 @@ AC_ARG_WITH(krb5, By default automatically enabled on platforms where a good system Kerberos 5 is available.]), ,) -#AC_ARG_WITH(system-redland, -#AS_HELP_STRING([--with-system-redland], -#[Use redland library already on system.]),, -#[with_system_redland="$with_system_libs"]) AC_ARG_WITH(gssapi, AS_HELP_STRING([--with-gssapi], @@ -6153,6 +6149,19 @@ if test "x$enable_postgresql_sdbc" != "xno"; then AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft Windows.]) fi ;; +Linux|GNU|*BSD) +if test "$with_krb5" != "no"; then +WITH_KRB5=YES +AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [], +[AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) +AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], +[AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) +fi +if test "$with_gssapi" != "no"; then +WITH_GSSAPI=YES +AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], +[AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) +fi *) if test "$with_krb5" = "yes"; then WITH_KRB5=YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - officecfg/registry sc/source sw/source xmloff/inc xmloff/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |2
sc/source/filter/xml/xmlstyle.cxx|4 -
sw/source/ui/uiview/view.cxx |2
xmloff/inc/xmloff/txtparae.hxx |3 -
xmloff/source/draw/sdpropls.cxx | 23 ++
xmloff/source/style/XMLPageExport.cxx|3 +
xmloff/source/text/txtparae.cxx | 32 ---
7 files changed, 57 insertions(+), 12 deletions(-)
New commits:
commit e2bc0c04ba0c33e02f1842013041f26ccb2de77d
Author: Michael Stahl
Date: Thu Feb 2 12:53:59 2012 +0100
fdo#45446: officecfg: turn off SaveBackwardCompatibleODF
As detailed in the bug, this option is the reason why LO writes several
elements and attributes that are not valid in ODF; the corresponding
bugs in the import filters are all fixed in OOo 2.4 or earlier,
so there is no reason to risk interoperability problems with other ODF
impolementations for this any more.
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 215999a..744c7f2 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -594,7 +594,7 @@
-true
+false
Date: Thu Feb 2 12:51:46 2012 +0100
fdo#45447: add an assertion when anchored to page 0
XMLTextParagraphExport::addTextFrameAttributes: detect invalid anchor
page number; this really should be fixed in Writer/writerfilter though.
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 0335b74..3cd935a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2501,6 +2501,8 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
{
sal_Int16 nPage = 0;
rPropSet->getPropertyValue( sAnchorPageNo ) >>= nPage;
+SAL_WARN_IF(nPage <= 0, "xmloff",
+"ERROR: writing invalid anchor-page-number 0");
::sax::Converter::convertNumber( sValue, (sal_Int32)nPage );
GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_PAGE_NUMBER,
sValue.makeStringAndClear() );
commit 6c15b856242127ddca766da72489ba287e21
Author: Michael Stahl
Date: Thu Feb 2 12:44:03 2012 +0100
fdo#45534: ODF export: fix draw:fit-to-size
In ODF 1.1 and 1.2 this attribute is of type boolean, so only write the
new values if the extended format is selected.
(regression introduced with e479f47f7d48dbd0d701bf347b6a2d5121ba3d34)
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 448d921..7c68585 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -619,6 +619,15 @@ SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
+SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] =
+{
+{ XML_FALSE,drawing::TextFitToSizeType_NONE },
+{ XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
+{ XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
+{ XML_TRUE, drawing::TextFitToSizeType_AUTOFIT },
+{ XML_TOKEN_INVALID, 0 }
+};
+
SvXMLEnumMapEntry const pXML_FitToSize_Enum[] =
{
{ XML_FALSE,drawing::TextFitToSizeType_NONE },
@@ -1047,7 +1056,19 @@ const XMLPropertyHandler*
XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum,
::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) );
break;
case XML_SD_TYPE_FITTOSIZE:
-pHdl = new XMLEnumPropertyHdl( pXML_FitToSize_Enum,
::getCppuType((const com::sun::star::drawing::TextFitToSizeType*)0) );
+{
+if (mpExport && (mpExport->getDefaultVersion()
+<= SvtSaveOptions::ODFVER_012))
+{
+pHdl = new
XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12,
+::getCppuType(static_cast(0)));
+}
+else
+{
+pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum,
+::getCppuType(static_cast(0)));
+}
+}
break;
case XML_SD_TYPE_MEASURE_UNIT:
pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum,
::getCppuType((const sal_Int32*)0) );
commit 0b7bba10208d198471cbdb56c2007e5cdb00a6ac
Author: Michael Stahl
Date: Thu Feb 2 12:07:59 2012 +0100
fdo#45449: ODF export: frames: invalid "min-width"
XMLTextParagraphExport::addTextFrameAttributes: delay writing of the
fo:min-width and fo:min-height attr
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d8cb61f5f32247a8bbaf89fb910c015b6107f051
Author: Muhammad Haggag
Date: Wed Feb 1 20:56:12 2012 +0200
dmapper: Switch paragraphs to RTL based on the value of w:BiDi.
This is a fix for 43398: FORMATTING: Documents opened in LibreOffice Writer
incorrectly appear as right justified.
Cause: dmapper used to treat the presence of a w:BiDi element in a
paragraph's properties as an indicator of RTL directionality, which is
incorrect. A w:BiDi element may have a value of 0, indicating LTR.
Fix: Inspect the integral value of w:BiDi elements before switching to RTL.
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 851ded2..34c23f7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1812,8 +1812,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
}
break; // sprmPOutLvl
case NS_sprm::LN_PFBiDi:
-rContext->Insert(PROP_WRITING_MODE, false, uno::makeAny(
text::WritingMode2::RL_TB ));
-rContext->Insert(PROP_PARA_ADJUST, false, uno::makeAny(
style::ParagraphAdjust_RIGHT ));
+{
+if (nIntValue != 0)
+{
+rContext->Insert(PROP_WRITING_MODE, false, uno::makeAny(
text::WritingMode2::RL_TB ));
+rContext->Insert(PROP_PARA_ADJUST, false, uno::makeAny(
style::ParagraphAdjust_RIGHT ));
+}
+}
break; // sprmPFBiDi
case NS_ooxml::LN_EG_SectPrContents_bidi:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sal/systools
sal/systools/win32/uwinapi/legacy.cpp | 46 +++
sal/systools/win32/uwinapi/makefile.mk | 76 ++
sal/systools/win32/uwinapi/uwinapi.dxp | 95 +
3 files changed, 69 insertions(+), 148 deletions(-)
New commits:
commit 0a23e1d2c639052393f1b37edd5702c050dda0d7
Author: Fridrich Strba
Date: Sat Jan 28 03:35:20 2012 -0700
Make Duden Korrektor 5 and 6 work
Signed-off-by: Petr Mladek
diff --git a/sal/systools/win32/uwinapi/legacy.cpp
b/sal/systools/win32/uwinapi/legacy.cpp
new file mode 100755
index 000..2218d1d
--- /dev/null
+++ b/sal/systools/win32/uwinapi/legacy.cpp
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Fridrich Strba
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning(disable:4273) // inconsistent dll linkage
+#endif
+
+EXTERN_C DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR
lpszShortPath,DWORD cchBuffer)
+{
+typedef DWORD (WINAPI * GetShortPathNameW_t) (LPCWSTR,LPWSTR,DWORD);
+
+GetShortPathNameW_t p_GetShortPathNameW =
+(GetShortPathNameW_t) GetProcAddress (
+GetModuleHandle ("kernel32.dll"), "GetShortPathNameW");
+
+if (p_GetShortPathNameW)
+return p_GetShortPathNameW(lpszLongPath,lpszShortPath,cchBuffer);
+else
+return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/makefile.mk
b/sal/systools/win32/uwinapi/makefile.mk
index 1d7e758..7b5c93b 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -47,69 +47,8 @@ CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
.ENDIF
-SLOFILES=
-
-.IF "$(CPU)"=="I"
-
-SLOFILES+=\
-$(SLO)$/CheckTokenMembership.obj\
-$(SLO)$/CommandLineToArgvW.obj\
-$(SLO)$/CopyFileExA.obj\
-$(SLO)$/CopyFileExW.obj\
-$(SLO)$/DrawStateW.obj\
-$(SLO)$/EnumProcesses.obj\
-$(SLO)$/GetLogicalDriveStringsW.obj\
-$(SLO)$/GetLongPathNameA.obj\
-$(SLO)$/GetLongPathNameW.obj\
-$(SLO)$/GetModuleFileNameExA.obj\
-$(SLO)$/GetModuleFileNameExW.obj\
-$(SLO)$/GetProcessId.obj\
-$(SLO)$/GetUserDefaultUILanguage.obj\
-$(SLO)$/GetUserDomainA.obj\
-$(SLO)$/GetUserDomainW.obj\
-$(SLO)$/GetDiskFreeSpaceExA.obj\
-$(SLO)$/GetDiskFreeSpaceExW.obj\
-$(SLO)$/MoveFileExA.obj\
-$(SLO)$/MoveFileExW.obj\
-$(SLO)$/toolhelp.obj\
-$(SLO)$/DllGetVersion.obj\
-$(SLO)$/DllMain.obj\
-$(SLO)$/ResolveThunk.obj\
-$(SLO)$/ResolveUnicows.obj\
-$(SLO)$/FindFirstVolumeA.obj\
-$(SLO)$/FindFirstVolumeW.obj\
-$(SLO)$/FindNextVolumeA.obj\
-$(SLO)$/FindNextVolumeW.obj\
-$(SLO)$/FindVolumeClose.obj\
-$(SLO)$/FindFirstVolumeMountPointA.obj\
-$(SLO)$/FindFirstVolumeMountPointW.obj\
-$(SLO)$/FindNextVolumeMountPointA.obj\
-$(SLO)$/FindNextVolumeMountPointW.obj\
-$(SLO)$/FindVolumeMountPointClose.obj\
-$(SLO)$/GetVolumeNameForVolumeMountPointA.obj\
-$(SLO)$/GetVolumeNameForVolumeMountPointW.obj\
-$(SLO)$/DeleteVolumeMountPointA.obj\
-$(SLO)$/DeleteVolumeMountPointW.obj\
-$(SLO)$/GetVolumePathNameA.obj\
-$(SLO)$/GetVolumePathNameW.obj\
-$(SLO)$/SetVolumeMountPointA.obj\
-$(SLO)$/SetVolumeMountPointW.obj\
-$(SLO)$/PathAddBackslashW.obj\
-$(SLO)$/PathCompactPathExW.obj\
-$(SLO)$/PathFileExistsW.obj\
-$(SLO)$/PathFindExtensionW.obj\
-$(SLO)$/PathFindFileNameW.obj\
-$(SLO)$/PathIsFileSpecW.obj\
-$(SLO)$/PathIsUNCW.obj\
-$(SLO)$/PathRemoveExtensionW.obj\
-$(SLO)$/PathRemoveFileSpecW.obj\
-$(SLO)$/PathSetDlgItemPathW.obj\
-$(SLO)$/PathStripToRootW.obj\
-$(SLO)$/SHCreateItemFromParsingName.o
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 244899285bfc515cca0a323f4aecf06b00342848
Author: Jesús Corrius
Date: Thu Feb 2 12:00:02 2012 +0100
Try to fix the MinGW build with a simple solution
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d491404..be70008 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -95,7 +95,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool )
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExitW( 0, rErrorText.getStr() );
+FatalAppExitW( 0, reinterpret_cast(rErrorText.getStr()) );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/xsltfilter/module_xsltfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b2ab2969d50559b68055e564ca739abad5b6c8c Author: Fridrich Å trba Date: Thu Feb 2 11:42:01 2012 +0100 Chose xslt filters for default install, not for minimal though Signed-off-by: Andras Timar diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 7854ce7..a3206b0 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples gid_File_Xsl_Export_Xhtml_Table, gid_File_Share_Registry_Xsltfilter_Xcd ); Minimal = NO; -Default = NO; +Default = YES; Styles = ( ); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/xsltfilter/module_xsltfilter.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe5640594eea2637b720f7311eed0c4f218a6893 Author: Fridrich Å trba Date: Thu Feb 2 11:42:01 2012 +0100 Chose xslt filters for default install, not for minimal though diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 7854ce7..a3206b0 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples gid_File_Xsl_Export_Xhtml_Table, gid_File_Share_Registry_Xsltfilter_Xcd ); Minimal = NO; -Default = NO; +Default = YES; Styles = ( ); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5e2b41dbfed8d0daae092074025e6194d0787360
Author: Caolán McNamara
Date: Thu Feb 2 10:17:12 2012 +
unsigned int->sal_uInt32
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index ebe5af8..712fad0 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1617,7 +1617,7 @@ static void columnMetaData2DatabaseTypeDescription(
Reference< XStatement > domainTypeStmt = m_origin->createStatement();
columnMetaData2DatabaseTypeDescription( domainMap, rs, domainTypeStmt );
-unsigned int colNum;
+sal_uInt32 colNum(0);
OUString sSchema( ASCII_STR("#invalid#") );
OUString sTable( ASCII_STR("#invalid#") );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/saldata.cxx | 10 +-
vcl/win/source/app/salinfo.cxx |8
vcl/win/source/app/salinst.cxx | 16
3 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 37c198cf098976d4b6814017f3ac1a81b53d2fb5
Author: Jesús Corrius
Date: Thu Feb 2 09:54:00 2012 +0100
Revert "Win32 API calls use the Unicode versions by default"
This reverts commit 157a32f0dc2eaa195ff60e8b60902554e73e999f. The patch is
good but it breaks the MinGW build because the compiler is misconfigured and by
default the API calls there are ANSI.
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 617b03f..4445315 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -93,35 +93,35 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const
char* pStr2 )
BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return PostMessage( hWnd, nMsg, wParam, lParam );
+return PostMessageW( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return SendMessage( hWnd, nMsg, wParam, lParam );
+return SendMessageW( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax )
{
-return GetMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
+return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
}
// ---
BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax, UINT wRemoveMsg )
{
-return PeekMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
+return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
}
// ---
LONG ImplDispatchMessage( CONST MSG *lpMsg )
{
-return DispatchMessage( lpMsg );
+return DispatchMessageW( lpMsg );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index d370589..efd4d08 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -67,9 +67,9 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor,
sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr,
sal_IntPtr )
{
-MONITORINFOEX aInfo;
+MONITORINFOEXW aInfo;
aInfo.cbSize = sizeof( aInfo );
-if( GetMonitorInfo( reinterpret_cast(hMonitor), &aInfo ) )
+if( GetMonitorInfoW( reinterpret_cast(hMonitor), &aInfo ) )
{
aInfo.szDevice[CCHDEVICENAME-1] = 0;
rtl::OUString aDeviceName( reinterpret_cast(aInfo.szDevice) );
@@ -127,7 +127,7 @@ bool WinSalSystem::initMonitors()
aDev.cb = sizeof( aDev );
DWORD nDevice = 0;
boost::unordered_map< rtl::OUString, int, rtl::OUStringHash >
aDeviceStringCount;
-while( EnumDisplayDevices( NULL, nDevice++, &aDev, 0 ) )
+while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) )
{
if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
&& !(aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) ) //
sort out non/disabled monitors
@@ -236,7 +236,7 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString&
rTitle, const rtl::O
nFlags |=
DEFAULT_BTN_MAPPING_TABLE[nButtonCombination][nDefaultButton];
ImplHideSplash();
-return MessageBox(
+return MessageBoxW(
0,
reinterpret_cast(rMessage.getStr()),
reinterpret_cast(rTitle.getStr()),
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index c75ee06..d491404 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -89,13 +89,13 @@ void SalAbort( const rtl::OUString& rErrorText, bool )
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExit( 0, L"Application Error" );
+FatalAppExitW( 0, L"Application Error" );
}
else
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExit( 0, rErrorText.getStr() );
+FatalAppExitW( 0, rErrorText.getStr() );
}
}
@@ -521,32 +521,32 @@ SalInstance* CreateSalInstance()
aWndClassEx.lpszMenuName= 0;
aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW;
ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon,
aWndClassEx.hIconSm );
-if ( !RegisterClassEx( &aWndClassEx ) )
+if ( !RegisterClassExW( &aWndClassEx ) )
return NULL;
aWndClassEx.hIcon
