[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 46 ++
1 file changed, 42 insertions(+), 4 deletions(-)
New commits:
commit f839984910f0fd4ef385552df3af5e09190e15b9
Author: Markus Mohrhard
Date: Wed Apr 25 01:12:48 2012 +0200
add test case for copy&paste formulas between documents
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 7662602..d875e42 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4262,16 +4262,24 @@ void Test::testCopyPasteFormulas()
void Test::testCopyPasteFormulasExternalDoc()
{
+rtl::OUString aDocName("file:///source.fake");
+SfxMedium* pMedium = new SfxMedium(aDocName, STREAM_STD_READWRITE);
+m_xDocShRef->DoInitNew(pMedium);
+m_pDoc = m_xDocShRef->GetDocument();
+
ScDocShellRef xExtDocSh = new ScDocShell;
-OUString aExtDocName(RTL_CONSTASCII_USTRINGPARAM("file:///extdata.fake"));
-OUString aExtSh1Name(RTL_CONSTASCII_USTRINGPARAM("ExtSheet1"));
-OUString aExtSh2Name(RTL_CONSTASCII_USTRINGPARAM("ExtSheet2"));
-OUString aExtSh3Name(RTL_CONSTASCII_USTRINGPARAM("ExtSheet3"));
+OUString aExtDocName("file:///extdata.fake");
+OUString aExtSh1Name("ExtSheet1");
+OUString aExtSh2Name("ExtSheet2");
SfxMedium* pMed = new SfxMedium(aExtDocName, STREAM_STD_READWRITE);
xExtDocSh->DoInitNew(pMed);
CPPUNIT_ASSERT_MESSAGE("external document instance not loaded.",
findLoadedDocShellByName(aExtDocName) != NULL);
+ScDocument* pExtDoc = xExtDocSh->GetDocument();
+pExtDoc->InsertTab(0, aExtSh1Name);
+pExtDoc->InsertTab(1, aExtSh2Name);
+
m_pDoc->InsertTab(0, "Sheet1");
m_pDoc->InsertTab(1, "Sheet2");
@@ -4280,7 +4288,37 @@ void Test::testCopyPasteFormulasExternalDoc()
m_pDoc->SetString(0,2,0, "=$Sheet2.A1");
m_pDoc->SetString(0,3,0, "=$Sheet2.$A$1");
m_pDoc->SetString(0,4,0, "=$Sheet2.A$1");
+m_pDoc->SetString(0,5,0, "=$Sheet1.$A$1");
+
+ScRange aRange(0,0,0,0,5,0);
+ScClipParam aClipParam(aRange, false);
+ScMarkData aMark;
+aMark.SetMarkArea(aRange);
+ScDocument* pClipDoc = new ScDocument(SCDOCMODE_CLIP);
+m_pDoc->CopyToClip(aClipParam, pClipDoc, &aMark);
+sal_uInt16 nFlags = IDF_ALL;
+aRange = ScRange(1,1,1,1,6,1);
+ScMarkData aMarkData2;
+aMarkData2.SetMarkArea(aRange);
+pExtDoc->CopyFromClip(aRange, aMarkData2, nFlags, NULL, pClipDoc);
+
+rtl::OUString aFormula;
+pExtDoc->GetFormula(1,1,1, aFormula);
+//adjust absolute refs pointing to the copy area
+CPPUNIT_ASSERT_EQUAL(aFormula, rtl::OUString("=COLUMN($B$2)"));
+pExtDoc->GetFormula(1,2,1, aFormula);
+//adjust absolute refs and keep relative refs
+CPPUNIT_ASSERT_EQUAL(aFormula, rtl::OUString("=$B$2+C3"));
+pExtDoc->GetFormula(1,3,1, aFormula);
+// make absolute sheet refs external refs
+CPPUNIT_ASSERT_EQUAL(aFormula,
rtl::OUString("='file:///source.fake'#$Sheet2.B2"));
+pExtDoc->GetFormula(1,4,1, aFormula);
+CPPUNIT_ASSERT_EQUAL(aFormula,
rtl::OUString("='file:///source.fake'#$Sheet2.$A$1"));
+pExtDoc->GetFormula(1,5,1, aFormula);
+CPPUNIT_ASSERT_EQUAL(aFormula,
rtl::OUString("='file:///source.fake'#$Sheet2.B$1"));
+pExtDoc->GetFormula(1,6,1, aFormula);
+CPPUNIT_ASSERT_EQUAL(aFormula, rtl::OUString("=$ExtSheet2.$B$2"));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/inc/about.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 52d90ce040234cb35fad03bdd12e201bfa3a8634 Author: Takeshi Abe Date: Wed Apr 25 01:29:20 2012 +0900 removed unused typedef diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 2a81c37..a665215 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -38,8 +38,6 @@ #include // SfxModalDialog #include -typedef ::std::vector< Accelerator* > AccelList; - // class AboutDialog - class AboutDialog : public SfxModalDialog ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - configure.in connectivity/source cppuhelper/inc
configure.in | 114 +++
connectivity/source/drivers/macab/MacabPreparedStatement.hxx |4
cppuhelper/inc/cppuhelper/interfacecontainer.h |2
3 files changed, 86 insertions(+), 34 deletions(-)
New commits:
commit e5143062887093037cab8f936288af8408576ea8
Author: Tor Lillqvist
Date: Tue Apr 24 22:30:03 2012 +0300
Visibility doesn't seem to work as we want in Apple's Clang
Or maybe it's the Mach-O object file format that lacks the
functionality? Anyway, let's try to manage without visibility then.
diff --git a/configure.in b/configure.in
index 5618f1e..9fcc1f8 100644
--- a/configure.in
+++ b/configure.in
@@ -4540,6 +4540,15 @@ if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_VISIBILITY_FEATURE=TRUE ],[])
CFLAGS=$save_CFLAGS
+
+if test "$COM_GCC_IS_CLANG" = TRUE -a $_os = Darwin; then
+# It seems that with Apple's Clang, visibility doesn't work as
+# we would want at least in the connectivity and dbaccess
+# modules. This might be because of something peculiar in
+# those modules? Whatever.
+HAVE_GCC_VISIBILITY_FEATURE=
+fi
+
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
AC_MSG_RESULT([yes])
else
commit f024b6804d216c4eee2ebd09074eff2ca1984997
Author: Tor Lillqvist
Date: Tue Apr 24 22:25:20 2012 +0300
Work around Clang 3.1's "argument unused during compilation" non-warning
For unrecognized options, Clang 3.1 (and ealier?) prints out a
warning, but it isn't a real warning as it doesn't cause a compilation
error with -Werror, so it is impossible to find out reliably if an
option is supported or not. So hardcode the information we know.
diff --git a/configure.in b/configure.in
index de31aec..5618f1e 100644
--- a/configure.in
+++ b/configure.in
@@ -2512,7 +2512,7 @@ dnl
===
dnl Test the gcc version
dnl ===
if test "$GCC" = "yes"; then
-AC_MSG_CHECKING([the GNU C compiler version])
+AC_MSG_CHECKING([the GCC version])
_gcc_version=`$CC -dumpversion`
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*1+\$2*100+\$3 }'`
@@ -2537,13 +2537,10 @@ if test "$GCC" = "yes"; then
fi
dnl ===
-dnl Is it actually Clang?
+dnl Is GCC actually Clang?
dnl ===
COM_GCC_IS_CLANG=
-HAVE_GCC_GGDB2=
-HAVE_GCC_FINLINE_LIMIT=
-HAVE_GCC_FNO_INLINE=
if test "$GCC" = "yes"; then
AC_MSG_CHECKING([whether GCC is actually Clang])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
@@ -2556,15 +2553,37 @@ if test "$GCC" = "yes"; then
COM_GCC_IS_CLANG=TRUE],
[AC_MSG_RESULT([no])])
-# check various GCC options that Clang does not support now but maybe
-# will somewhen in the future, check them even for GCC, so that the flags
-# are set
+if test "$COM_GCC_IS_CLANG" = TRUE; then
+AC_MSG_CHECKING([the Clang version])
+clang_version=`echo
__clang_major__.__clang_minor__.__clang_patchlevel__ | $CC -E -P -`
+CLANG_FULL_VERSION=`echo __clang_version__ | $CC -E -P -`
+CLANGVER=`echo $clang_version | $AWK -F. '{ print
\$1*1+\$2*100+\$3 }'`
+AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
+fi
+fi
+AC_SUBST(COM_GCC_IS_CLANG)
+
+# ===
+# check various GCC options that Clang does not support now but maybe
+# will somewhen in the future, check them even for GCC, so that the
+# flags are set
+# ===
+HAVE_GCC_GGDB2=
+HAVE_GCC_FINLINE_LIMIT=
+HAVE_GCC_FNO_INLINE=
+if test "$GCC" = "yes"; then
AC_MSG_CHECKING([whether $CC supports -ggdb2])
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -Werror -ggdb2"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_GGDB2=TRUE ],[])
-CFLAGS=$save_CFLAGS
+if test -n "$CLANGVER" -a "$CLANGVER" -le 30100; then
+# Option just ignored and silly warning that isn't a real
+# warning printed
+:
+else
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -ggdb2"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[
HAVE_GCC_GGDB2=TRUE ],[])
+CFLAGS=$save_CFLAGS
+fi
if test "$HAVE_GCC_GGDB2" = "TRUE"; then
AC_MSG_RESULT([yes])
else
@@ -2572,10 +2591,15 @@ if test "$GCC" = "yes"; then
fi
AC_MSG_CHECKING([whether $CC supports -finline-limit=0])
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -Werror -finline-limit=0"
-AC_LINK_IFELSE([AC_LANG_P
[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/windowscustomaction_ooo.scp |9 ++
setup_native/source/win32/customactions/sellang/exports.dxp |1
setup_native/source/win32/customactions/sellang/makefile.mk |3
setup_native/source/win32/customactions/sellang/sorttree.cxx | 37 +++
4 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 39bb77fd667f9d9fdaf374f3934b6eec7b7dc57a
Author: Andras Timar
Date: Tue Apr 24 21:51:33 2012 +0200
fdo#46355 sort SelectionTree control of Custom Setup with a custom action
Although Microsoft says that SelectionTree control can publish a control
event only on Windows Server 2003 and above, the custom action seems to
be working under a fully patched Windows XP SP3. Maybe it fails silently
on older Windows XPs, not to mention Windows 2000. I did not test those.
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 70197b7..51cfda1 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -474,6 +474,15 @@ WindowsCustomAction gid_Customaction_SelectLanguage
Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction",
"SelectLanguage", "1", "1");
End
+WindowsCustomAction gid_Customaction_SortTree
+Name = "SortTree";
+Typ = "321";
+Source = "sellangmsi.dll";
+Target = "SortTree";
+Inbinarytable = 1;
+Assignment1 = ("ControlEvent", "CustomSetup", "Tree", "DoAction",
"SortTree", "1", "1");
+End
+
WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
Name = "RebaseLibrariesOnProperties";
Typ = "65";
diff --git a/setup_native/source/win32/customactions/sellang/exports.dxp
b/setup_native/source/win32/customactions/sellang/exports.dxp
index cc6dd8d..c8a622e 100644
--- a/setup_native/source/win32/customactions/sellang/exports.dxp
+++ b/setup_native/source/win32/customactions/sellang/exports.dxp
@@ -1 +1,2 @@
SelectLanguage
+SortTree
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk
b/setup_native/source/win32/customactions/sellang/makefile.mk
index ffad814..862653e 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -49,7 +49,8 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
UWINAPILIB=
SLOFILES = \
-$(SLO)$/sellang.obj
+$(SLO)/sellang.obj \
+$(SLO)/sorttree.obj
SHL1STDLIBS= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx
b/setup_native/source/win32/customactions/sellang/sorttree.cxx
new file mode 100644
index 000..25c6c6d
--- /dev/null
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifdef _MSC_VER
+#pragma warning(push, 1) /* disable warnings within system headers */
+#endif
+#define WIN32_LEAN_AND_MEAN
+#include
+#include
+#include
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+extern "C" UINT __stdcall SortTree(MSIHANDLE)
+{
+// Sort items (languages) in SelectionTree control, fdo#46355
+
+HWND hwndMSI = FindWindow(TEXT("MsiDialogCloseClass"), NULL);
+HWND hwndTV = FindWindowEx(hwndMSI, NULL, TEXT("SysTreeView32"), NULL);
+HTREEITEM treeRoot = TreeView_GetRoot(hwndTV);
+HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot);
+HTREEITEM dicts = TreeView_GetChild(hwndTV, optional);
+TreeView_SortChildren(hwndTV, dicts, TRUE);
+HTREEITEM langs = TreeView_GetNextSibling(hwndTV, optional);
+TreeView_SortChildren(hwndTV, langs, TRUE);
+
+ return ERROR_SUCCESS;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/inc toolkit/source unusedcode.easy
toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 11 ++-
toolkit/source/controls/unocontrolmodel.cxx | 12
unusedcode.easy |1 -
3 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit d8f145d1ebe8836f559ba47a1978063d922c6294
Author: Caolán McNamara
Date: Tue Apr 24 16:21:16 2012 +0100
save the next guy from getting caught with msvc template requirements
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 99722b7..e0d6aa8 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -109,7 +109,16 @@ protected:
) const;
protected:
-UnoControlModel();
+UnoControlModel() //do not use! needed by MSVC at compile time to satisfy
WeakAggImplHelper7
+: UnoControlModel_Base()
+, MutexAndBroadcastHelper()
+, OPropertySetHelper( BrdcstHelper )
+, maDisposeListeners( *this )
+, maContext( ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >() )
+{
+assert(false);
+}
+
public:
UnoControlModel( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& i_factory );
UnoControlModel( const UnoControlModel& rModel );
diff --git a/toolkit/source/controls/unocontrolmodel.cxx
b/toolkit/source/controls/unocontrolmodel.cxx
index 2d0a2fd..9b24903 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -122,18 +122,6 @@ static void lcl_ImplMergeFontProperty( FontDescriptor&
rFD, sal_uInt16 nPropId,
//
// class UnoControlModel
//
-UnoControlModel::UnoControlModel()
-:UnoControlModel_Base()
-,MutexAndBroadcastHelper()
-,OPropertySetHelper( BrdcstHelper )
-,maDisposeListeners( *this )
-,maContext( ::comphelper::getProcessServiceFactory() )
-{
-OSL_ENSURE( false, "UnoControlModel::UnoControlModel: not implemented.
Well, not really." );
-// just implemented to let the various FooImplInheritanceHelper compile,
you should use the
-// version taking a service factory
-}
-
UnoControlModel::UnoControlModel( const Reference< XMultiServiceFactory >&
i_factory )
:UnoControlModel_Base()
,MutexAndBroadcastHelper()
diff --git a/unusedcode.easy b/unusedcode.easy
index d1f5e1d..938fcd7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -261,7 +261,6 @@ TempFile::IsValid() const
TextEngine::GetLeftMargin() const
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor
const&, com::sun::star::uno::Reference&)
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
-UnoControlModel::UnoControlModel()
VCLUnoHelper::CreatePointer()
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - desktop/inc desktop/source sdext/source
desktop/inc/app.hxx|4
desktop/source/app/app.cxx | 12 +-
desktop/source/app/check_ext_deps.cxx | 55 +
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |2
desktop/source/deployment/inc/dp_misc.h|3
desktop/source/deployment/manager/dp_extensionmanager.cxx |2
desktop/source/deployment/misc/dp_misc.cxx |6 -
desktop/source/pkgchk/unopkg/unopkg_app.cxx|2
sdext/source/minimizer/description.xml |2
sdext/source/pdfimport/description.xml |2
sdext/source/presenter/description.xml |2
11 files changed, 45 insertions(+), 47 deletions(-)
New commits:
commit 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666
Author: Stephan Bergmann
Date: Tue Apr 24 19:16:06 2012 +0200
Force ExtensionManager resync when the implementation changes
...as checking the lastsynchronized time-stamps can give wrong results if
new and old
impl use same user config and old impl is started once more after new impl
is installed,
in which case per-user data of bundled exts of new impl would not be
regenerated,
leading to inconsistencies.
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index fa4553a..28b2c63 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -130,12 +130,14 @@ class Desktop : public Application
static sal_Bool isCrashReporterEnabled();
// first-start (ever) related methods
+static bool newInstallation();
+
static sal_Bool CheckExtensionDependencies();
static void DoRestartActionsIfNecessary( sal_Bool
bQuickStart );
static void SetRestartState();
-voidSynchronizeExtensionRepositories();
+voidSynchronizeExtensionRepositories(bool force);
voidSetSplashScreenText( const ::rtl::OUString&
rText );
voidSetSplashScreenProgress( sal_Int32 );
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6df1561..5d299e1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1608,10 +1608,14 @@ int Desktop::Main()
// Check if bundled or shared extensions were added /removed
// and process those extensions (has to be done before checking
// the extension dependencies!
-SynchronizeExtensionRepositories();
-bool bAbort = CheckExtensionDependencies();
-if ( bAbort )
-return EXIT_FAILURE;
+bool newInst = newInstallation();
+SynchronizeExtensionRepositories(newInst);
+if ( newInst )
+{
+bool bAbort = CheckExtensionDependencies();
+if ( bAbort )
+return EXIT_FAILURE;
+}
{
::comphelper::ComponentContext aContext( xSMgr );
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index 9a48732..2e0d24a 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -344,33 +344,12 @@ static void impl_setNeedsCompatCheck()
}
//--
-static bool impl_check()
-{
-uno::Reference< uno::XComponentContext > xContext =
comphelper_getProcessComponentContext();
-
-bool bDependenciesValid = impl_checkDependencies( xContext );
-
-short nRet = 0;
-
-if ( !bDependenciesValid )
-nRet = impl_showExtensionDialog( xContext );
-
-if ( nRet == -1 )
-{
-impl_setNeedsCompatCheck();
-return true;
-}
-else
-return false;
-}
-
-//--
// to check if we need checking the dependencies of the extensions again, we
compare
// the build id of the office with the one of the last check
//--
-static bool impl_needsCompatCheck()
+bool Desktop::newInstallation()
{
-bool bNeedsCheck = false;
+bool bNewInst = false;
rtl::OUString aLastCheckBuildID;
rtl::OUString aCurrentBuildID( UNISTRING( "${$BRAND_BASE_DIR/program/"
SAL_CONFIGFILE("version") ":buildid}" ) );
rtl::Bootstrap::expandMacros( aCurrentBuildID );
@@ -392,18 +371,18 @@ static bool impl_needsCompatCheck()
result >>= aLastCheckBuildID;
if ( aLastCheckBuildID != aCurrentBuildID )
{
-bNeedsCheck = true;
+bNewInst = true;
result <<= aCurrentBuildID;
pset->setPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")), result );
Reference< util::XChangesBatch >( pset, UNO_QUERY_THROW
)->commitCh
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5304afbdb07997678638ec2f340f0e09801706b6
Author: Caolán McNamara
Date: Tue Apr 24 18:54:39 2012 +0100
need to adapt for older api
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 02afdc0..ff81727 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -554,9 +554,9 @@ rtl_TextEncoding lcl_getDefaultTextEncoding()
const OUString& rLanguage =
Application::GetSettings().GetLocale().Language;
-if (rLanguage == "ru" || rLanguage == "uk")
+if (rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ru")) ||
rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("uk")))
return RTL_TEXTENCODING_MS_1251;
-if (rLanguage == "tr")
+if (rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("tr")))
return RTL_TEXTENCODING_MS_1254;
else
return RTL_TEXTENCODING_MS_1252;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/navipi/navipi.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 1a87849f1971bf6802cc3d6395181b6ff0ceeed1 Author: Ivan Timofeev Date: Tue Apr 24 21:22:16 2012 +0400 fdo#34999: UI: Navigator row selector pane exceeds reserved grey area diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index c6d4afa..5eabf0a 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -675,7 +675,9 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win aTitleBase = GetText(); -long nListboxYPos = aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height() + 4; +long nListboxYPos = +Max( aTbxCmd.GetPosPixel().Y() + aTbxCmd.GetSizePixel().Height(), + aEdRow.GetPosPixel().Y() + aEdRow.GetSizePixel().Height() ) + 4; aLbEntries.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y); nBorderOffset = aLbEntries.GetPosPixel().X(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx
vcl/unx/generic/app/salinst.cxx |3 --
vcl/unx/gtk/app/gtkinst.cxx | 54 +++-
2 files changed, 43 insertions(+), 14 deletions(-)
New commits:
commit 8ceb098374284d4ab78a6e6e649b0674dcae40d4
Author: Caolán McNamara
Date: Tue Apr 24 12:03:27 2012 +0100
Resolves: fdo#48011 writer idle-callbacks are halting when events pending
Writer does a lot of work, e.g. spell-checking, word counting etc. in
idle-callbacks. It halts work by checking for AnyInput, and if any input or
paint etc is pending the idle-callbacks stop. With gtk3 rework pending
events don't seem to be available quite right.
Signed-off-by: Michael Meeks
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 33e4ede..64e29e5 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -148,9 +148,8 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType)
Display *pDisplay = pData->GetSalDisplay()->GetDisplay();
sal_Bool bRet = sal_False;
-if( (nType & VCL_INPUT_TIMER) && mpXLib->CheckTimeout( false ) )
+if( (nType & VCL_INPUT_TIMER) && (mpXLib && mpXLib->CheckTimeout(false)) )
bRet = sal_True;
-
else if (XPending(pDisplay) )
{
PredicateReturn aInput;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index b6eacc9..f409bfa 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -27,6 +27,7 @@
/
+#include
#include
#include
#include
@@ -263,12 +264,11 @@ extern "C" {
return GDK_FILTER_CONTINUE;
}
-// And then again as they pop out of gdk and into gtk+
-
-static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+static sal_uInt16 categorizeEvent(const GdkEvent *pEvent)
{
sal_uInt16 nType = 0;
-switch( pEvent->type ) {
+switch( pEvent->type )
+{
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
@@ -290,8 +290,16 @@ extern "C" {
nType = VCL_INPUT_OTHER;
break;
}
-((GtkInstance *)data)->subtractEvent( nType );
+return nType;
+}
+
+// And then again as they pop out of gdk and into gtk+
+
+static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+{
+sal_uInt16 nType = categorizeEvent(pEvent);
+((GtkInstance *)data)->subtractEvent( nType );
gtk_main_do_event( pEvent );
}
}
@@ -622,16 +630,38 @@ bool GtkInstance::AnyInput( sal_uInt16 nType )
{
if( (nType & VCL_INPUT_TIMER) && IsTimerExpired() )
return true;
-else
+#if !GTK_CHECK_VERSION(3,0,0)
+bool bRet = X11SalInstance::AnyInput(nType);
+#else
+if (!gdk_events_pending())
+return false;
+
+if (nType == VCL_INPUT_ANY)
+return true;
+
+bool bRet = false;
+std::stack aEvents;
+GdkEvent *pEvent = NULL;
+while ((pEvent = gdk_event_get()))
{
-bool bRet = false;
-sal_uInt16 nShift = 1;
-for (int i = 0; i < 16; i++) {
-bRet |= (nType & nShift) && m_nAnyInput[i] > 0;
-nShift <<= 1;
+aEvents.push(pEvent);
+sal_uInt16 nEventType = categorizeEvent(pEvent);
+if ( (nEventType & nType) || ( ! nEventType && (nType &
VCL_INPUT_OTHER) ) )
+{
+bRet = true;
+break;
}
-return bRet;
}
+
+while (!aEvents.empty())
+{
+pEvent = aEvents.top();
+gdk_event_put(pEvent);
+gdk_event_free(pEvent);
+aEvents.pop();
+}
+#endif
+return bRet;
}
GenPspGraphics *GtkInstance::CreatePrintGraphics()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/ui/inc/unotxvw.hxx | 10 ++---
sw/source/ui/uno/unotxvw.cxx | 72 +++
2 files changed, 30 insertions(+), 52 deletions(-)
New commits:
commit 009920703bfd5426588ee575b94231064c4b45df
Author: Michael Stahl
Date: Tue Apr 24 18:56:09 2012 +0200
SwXTextView: use cppu::OInterfaceContainerHelper
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 89a98f7..cf851bc 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -25,9 +25,10 @@
* for a copy of the LGPLv3 License.
*
/
-#ifndef _UNOTXVW_HXX
-#define _UNOTXVW_HXX
+#ifndef SW_UNOTXVW_HXX
+#define SW_UNOTXVW_HXX
#include
+#include
#include
#include
#include
@@ -55,9 +56,6 @@
class SdrObject;
class SwView;
-typedef ::com::sun::star::uno::Reference<
::com::sun::star::view::XSelectionChangeListener > XSelectionChangeListenerRef;
-typedef std::vector SelectionChangeListenerArr;
-
class SwXTextView :
public ::com::sun::star::view::XSelectionSupplier,
public ::com::sun::star::lang::XServiceInfo,
@@ -69,7 +67,7 @@ class SwXTextView :
public ::com::sun::star::datatransfer::XTransferableSupplier,
public SfxBaseController
{
-SelectionChangeListenerArr aSelChangedListeners;
+::cppu::OInterfaceContainerHelper m_SelChangedListeners;
SwView* m_pView;
const SfxItemPropertySet* m_pPropSet; // property map for SwXTextView
properties
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index ce17dab..fb08029 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -109,6 +109,7 @@ SwPaM* lcl_createPamCopy(const SwPaM& rPam)
**/
SwXTextView::SwXTextView(SwView* pSwView) :
SfxBaseController(pSwView),
+m_SelChangedListeners(m_aMutex),
m_pView(pSwView),
m_pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXT_VIEW ) ),
pxViewSettings(0),
@@ -139,23 +140,11 @@ void SwXTextView::Invalidate()
m_refCount++; //prevent second d'tor call
-sal_uInt16 nCount = aSelChangedListeners.size();
-if(nCount)
{
-uno::Reference< uno::XInterface > xInt =
(cppu::OWeakObject*)(SfxBaseController*)this;
+uno::Reference const xInt(static_cast<
+cppu::OWeakObject*>(static_cast(this)));
lang::EventObject aEvent(xInt);
-for ( sal_uInt16 i = nCount; i--; )
-{
-uno::Reference< view::XSelectionChangeListener > *pObj =
&aSelChangedListeners[i];
-(*pObj)->disposing(aEvent);
-}
-}
-
-// #i85580: now clean up any possibly remaining entries in the array...
-// (i.e. listeners that did not call removeSelectionChangeListener in
their disposing.)
-while ((nCount = aSelChangedListeners.size()) != 0)
-{
-removeSelectionChangeListener( aSelChangedListeners[0] );
+m_SelChangedListeners.disposeAndClear(aEvent);
}
m_refCount--;
@@ -606,7 +595,7 @@ void SwXTextView::addSelectionChangeListener(
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
-aSelChangedListeners.push_back(rxListener);
+m_SelChangedListeners.addInterface(rxListener);
}
void SwXTextView::removeSelectionChangeListener(
@@ -614,18 +603,7 @@ void SwXTextView::removeSelectionChangeListener(
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
-view::XSelectionChangeListener* pLeft = rxListener.get();
-for(SelectionChangeListenerArr::iterator it = aSelChangedListeners.begin();
-it != aSelChangedListeners.end(); ++it)
-{
-uno::Reference< view::XSelectionChangeListener > * pElem = &*it;
-view::XSelectionChangeListener* pRight = pElem->get();
-if(pLeft == pRight)
-{
-aSelChangedListeners.erase(it);
-break;
-}
-}
+m_SelChangedListeners.removeInterface(rxListener);
}
SdrObject* SwXTextView::GetControl(
@@ -877,16 +855,27 @@ void SwXTextView::NotifySelChanged()
{
OSL_ENSURE( m_pView, "view is missing" );
-uno::Reference< uno::XInterface > xInt =
(cppu::OWeakObject*)(SfxBaseController*)this;
+uno::Reference const xInt(
+
static_cast(static_cast(this)));
- lang::EventObject aEvent(xInt);
+lang::EventObject const aEvent(xInt);
+m_SelChangedListeners.notifyEach(
+&view::XSelectionChangeListener::selectionChanged, aEvent);
+}
-sal_uInt16 nCount = aSelChangedListeners.size();
-for ( sal_uInt16 i = nCount; i--; )
+namespace {
+struct DispatchListener
{
-uno::Reference< view::XSelectionChangeListener > *pObj =
&aSelChangedListeners[i];
-(*pObj)->selectionChanged(aEvent);
-}
+URL const & m_rURL;
+Sequenc
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit c5282a72180ab7747c923cdc2b1988d15d3956b1
Author: Miklos Vajna
Date: Sat Apr 21 11:25:18 2012 +0200
fdo#48023 fix RTF import of Russian characters without an encoding specified
lcl_GetDefaultTextEncodingForRTF() in editeng did the same.
Signed-off-by: Caolán McNamara
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aca6a29..02afdc0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -549,13 +549,26 @@ sal_uInt32 RTFDocumentImpl::getColorTable(sal_uInt32
nIndex)
return 0;
}
+rtl_TextEncoding lcl_getDefaultTextEncoding()
+{
+
+const OUString& rLanguage =
Application::GetSettings().GetLocale().Language;
+
+if (rLanguage == "ru" || rLanguage == "uk")
+return RTL_TEXTENCODING_MS_1251;
+if (rLanguage == "tr")
+return RTL_TEXTENCODING_MS_1254;
+else
+return RTL_TEXTENCODING_MS_1252;
+}
+
rtl_TextEncoding RTFDocumentImpl::getEncoding(sal_uInt32 nFontIndex)
{
if (!m_pSuperstream)
{
if (nFontIndex < m_aFontEncodings.size())
return m_aFontEncodings[nFontIndex];
-return 0;
+return lcl_getDefaultTextEncoding();
}
else
return m_pSuperstream->getEncoding(nFontIndex);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source toolkit/inc toolkit/source unusedcode.easy
editeng/inc/editeng/editeng.hxx |4 ++--
editeng/inc/editeng/editobj.hxx |4 ++--
editeng/source/editeng/editattr.hxx |4 ++--
editeng/source/editeng/editeng.cxx |4 ++--
editeng/source/editeng/editobj.cxx |8
editeng/source/editeng/editobj2.hxx | 17 +++--
editeng/source/editeng/impedit.hxx |6 +++---
editeng/source/editeng/impedit3.cxx |6 +++---
toolkit/inc/toolkit/controls/unocontrolbase.hxx |6 --
toolkit/source/controls/unocontrolbase.cxx |8
unusedcode.easy |1 -
11 files changed, 29 insertions(+), 39 deletions(-)
New commits:
commit b856ea5af5282b8790a0edd6aa3a6de5f54c3ba6
Author: Caolán McNamara
Date: Tue Apr 24 16:07:24 2012 +0100
inline unused ctor needed by MSVC at compile time
diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
index 34779cc..d5e19ea 100644
--- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
@@ -40,8 +40,10 @@
class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
{
protected:
-UnoControlBase();
-
+UnoControlBase() //do not use! needed by MSVC at compile time to satisfy
AggImplInheritanceHelper5
+{
+assert(false);
+}
protected:
UnoControlBase( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& i_factory )
:UnoControl( i_factory )
commit 6ac292332620737bfe522166f88994097d1a5460
Author: Xavi Escriche Galindo
Date: Tue Apr 24 16:06:00 2012 +0100
Remove unused method UnoControlBase::UnoControlBase()
diff --git a/toolkit/source/controls/unocontrolbase.cxx
b/toolkit/source/controls/unocontrolbase.cxx
index dc95dec..1de8849 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -39,14 +39,6 @@
// class UnoControlBase
//
-UnoControlBase::UnoControlBase()
-:UnoControl( ::comphelper::getProcessServiceFactory() )
-{
-OSL_ENSURE( false, "UnoControlBase::UnoControlBase: not implemented. Well,
not really." );
-// just implemented to let the various FooImplInheritanceHelper compile,
you should use the
-// version taking a service factory
-}
-
sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId )
{
::rtl::OUString aPropName( GetPropertyName( nPropId ) );
diff --git a/unusedcode.easy b/unusedcode.easy
index b4fd869..d1f5e1d 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -261,7 +261,6 @@ TempFile::IsValid() const
TextEngine::GetLeftMargin() const
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor
const&, com::sun::star::uno::Reference&)
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
-UnoControlBase::UnoControlBase()
UnoControlModel::UnoControlModel()
VCLUnoHelper::CreatePointer()
VCLXPrinterServer::getImplementationId()
commit 070dfe4840cfb5854be6aba99dd65b9015ed0a90
Author: Caolán McNamara
Date: Tue Apr 24 15:46:11 2012 +0100
WaE: mixing comparison of bool and sal_Bool
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index f2208a9..8b23f00 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -223,8 +223,8 @@ public:
voidSetPaperSize( const Size& rSize );
const Size& GetPaperSize() const;
-voidSetVertical( sal_Bool bVertical );
-sal_BoolIsVertical() const;
+voidSetVertical( bool bVertical );
+boolIsVertical() const;
voidSetFixedCellHeight( sal_Bool bUseFixedCellHeight );
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index b495efb..c57a70b 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -72,8 +72,8 @@ public:
virtual sal_uLong GetObjectSettings() const;
virtual voidSetObjectSettings( sal_uLong n );
-virtual sal_BoolIsVertical() const;
-virtual voidSetVertical( sal_Bool bVertical );
+virtual boolIsVertical() const;
+virtual voidSetVertical( bool bVertical );
virtual sal_uInt16 GetScriptType() const;
diff --git a/editeng/source/editeng/editattr.hxx
b/editeng/source/editeng/editattr.hxx
index 1a371d0..d2cdb42 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -107,10 +107,10 @@ public:
{ return ( ( nStart <= nIndex ) && ( nEnd >= nIndex ) ); }
sal_BoolIsInside( sal_uInt16 nIndex ) const
{ return ( ( nStart < nIndex ) && ( nEnd > nIndex ) ); }
-sal_BoolIsEmpty() const
+boolIsEmpty() const
{ return nStart == nEnd; }
[Libreoffice-commits] .: libcdr/libcdr-0.0.7-clang.patch libcdr/makefile.mk
libcdr/libcdr-0.0.7-clang.patch | 112
libcdr/makefile.mk |3 -
2 files changed, 114 insertions(+), 1 deletion(-)
New commits:
commit 9886c392383007ff86c849f61c641e4603f13259
Author: Fridrich Å trba
Date: Tue Apr 24 16:57:51 2012 +0200
Patch to build libcdr with clang
diff --git a/libcdr/libcdr-0.0.7-clang.patch b/libcdr/libcdr-0.0.7-clang.patch
new file mode 100644
index 000..fd5e163
--- /dev/null
+++ b/libcdr/libcdr-0.0.7-clang.patch
@@ -0,0 +1,112 @@
+--- misc/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24 13:25:22.0
+0200
misc/build/libcdr-0.0.7/src/lib/CDRCollector.cpp 2012-04-24
16:54:16.083829620 +0200
+@@ -30,6 +30,7 @@
+ #include
+ #include
+ #include "CDRCollector.h"
++#include "libcdr_utils.h"
+
+ libcdr::CDRParserState::CDRParserState()
+ : m_fillStyles(), m_lineStyles(), m_bmps(), m_patterns(), m_vects(),
m_pages(),
+--- misc/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24 13:12:28.0
+0200
misc/build/libcdr-0.0.7/src/lib/CDRCollector.h 2012-04-24
16:54:16.084829635 +0200
+@@ -42,32 +42,7 @@
+
+ namespace
+ {
+-int cdr_round(double d)
+-{
+- return (d>0) ? int(d+0.5) : int(d-0.5);
+-}
+-
+-void writeU16(WPXBinaryData &buffer, const int value)
+-{
+- buffer.append((unsigned char)(value & 0xFF));
+- buffer.append((unsigned char)((value >> 8) & 0xFF));
+-}
+-
+-void writeU32(WPXBinaryData &buffer, const int value)
+-{
+- buffer.append((unsigned char)(value & 0xFF));
+- buffer.append((unsigned char)((value >> 8) & 0xFF));
+- buffer.append((unsigned char)((value >> 16) & 0xFF));
+- buffer.append((unsigned char)((value >> 24) & 0xFF));
+-}
+-
+-void writeU8(WPXBinaryData &buffer, const int value)
+-{
+- buffer.append((unsigned char)(value & 0xFF));
+-}
+-
+ #include "CDRColorProfiles.h"
+-
+ }
+
+ namespace libcdr
+--- misc/libcdr-0.0.7/src/lib/CDRParser.cpp2012-04-24 15:40:42.0
+0200
misc/build/libcdr-0.0.7/src/lib/CDRParser.cpp 2012-04-24
16:54:16.084829635 +0200
+@@ -466,7 +466,7 @@
+ m_collector->collectObject(level);
+ else if (listType == FOURCC_grp)
+ m_collector->collectGroup(level);
+- else if ((listType & 0xff) == FOURCC_CDR || (listType && 0xff)
== FOURCC_cdr)
++ else if ((listType & 0xff) == FOURCC_CDR || (listType & 0xff)
== FOURCC_cdr)
+ m_version = getCDRVersion((listType & 0xff00) >> 24);
+ else if (listType == FOURCC_vect)
+ m_collector->collectVect(level);
+--- misc/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24 13:11:13.0
+0200
misc/build/libcdr-0.0.7/src/lib/libcdr_utils.cpp 2012-04-24
16:54:16.085829649 +0200
+@@ -139,6 +139,30 @@
+ return ((double)fixedPointNumberIntegerPart +
fixedPointNumberFractionalPart);
+ }
+
++int libcdr::cdr_round(double d)
++{
++ return (d>0) ? int(d+0.5) : int(d-0.5);
++}
++
++void libcdr::writeU16(WPXBinaryData &buffer, const int value)
++{
++ buffer.append((unsigned char)(value & 0xFF));
++ buffer.append((unsigned char)((value >> 8) & 0xFF));
++}
++
++void libcdr::writeU32(WPXBinaryData &buffer, const int value)
++{
++ buffer.append((unsigned char)(value & 0xFF));
++ buffer.append((unsigned char)((value >> 8) & 0xFF));
++ buffer.append((unsigned char)((value >> 16) & 0xFF));
++ buffer.append((unsigned char)((value >> 24) & 0xFF));
++}
++
++void libcdr::writeU8(WPXBinaryData &buffer, const int value)
++{
++ buffer.append((unsigned char)(value & 0xFF));
++}
++
+ #ifdef DEBUG
+ const char *libcdr::toFourCC(unsigned value, bool bigEndian)
+ {
+--- misc/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24 16:54:56.803806935
+0200
misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-04-24
16:54:16.085829649 +0200
+@@ -35,6 +35,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+@@ -90,6 +91,12 @@
+
+ double readFixedPoint(WPXInputStream *input, bool bigEndian=false);
+
++int cdr_round(double d);
++
++void writeU8(WPXBinaryData &buffer, const int value);
++void writeU16(WPXBinaryData &buffer, const int value);
++void writeU32(WPXBinaryData &buffer, const int value);
++
+ #ifdef DEBUG
+ const char *toFourCC(unsigned value, bool bigEndian=false);
+ #endif
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 85c8025..62eeb70 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -63,7 +63,8 @@ TARFILE_NAME=libcdr-0.0.7
TARFILE_MD5=c216ded0275129ccfef44fbc236ac16a
PATCH_FILES=\
-$(TARFILE_NAME).patch
+$(TARFILE_NAME).patch \
+ $(TARFILE_NAME)-clang.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/comp/scanner.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bc069413e54ae9626298f337b180dd4f142f4776
Author: Caolán McNamara
Date: Tue Apr 24 15:39:51 2012 +0100
WaE: return SYMBOL -> return true
has been return SYMBOL since initial checkin in 2000,
SYMBOL is a non-0 enum so return true here instead
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index a664e57..6f7f0bd 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -419,7 +419,7 @@ bool SbiScanner::NextSym()
// treated as an operator
--pLine; --nCol; nCol1 = nCol-1;
aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("&"));
-return SYMBOL;
+return true;
}
bNumber = true;
long l = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.2'
Tag 'libreoffice-3.5.3.2' created by Petr Mladek at 2012-04-24 15:08 -0700 Tag 3.5.3.2 (3.5.3-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPlrPRAAoJEPQ0oe+v7q6jS2sP/0RZvJ4byGFcuBBD3BTkYI9P RzjBXk3oSq1nBdwrqI3KUkNKt1eH3v877SeFW3M4O2J05UVa1kT52C/H3QVe0mfB mbNGlTermuVPJV7qgVj65JV2J9AejOdQbmu948PCVXVifRP93x0OewZsMC57fELE dJAIyCnO9c45hvugIQOfjALDIYI26lW7B7OqGIEWj+YXy3XizofTRkNBUhgoLVt4 SARSCuqP9+VGprWvlyQoh4gE9fmZeAMXADyVY1AP7aq77KbJocAdVBrDCOCzmoaM fWmEeJdXT0PSEOlIsthhpzQ2DqTIX2593t0tye/ZCayNDzRc8yDgOTh7SH6icdXW 6VD/1PazwLZDhBiV7mnVIlyE/rdguXJDKGSYF7O1u34XldYz2R/hpow9NtxisPRx LdCIIwVB+5GD9brPPH+/dBPXFQr3Al8N+BxXF8cOsT8krzYKnTdYNuQ7+koI5GRb 9aeKlFOnfHPtBWhvfsGklKoP1cZsS3ZVGE/0OGwuMKc4QNjFRnJlBtWahR8hg26J 3VeTuAF5ZWEmaFEAmR3d4OMvGqqDgfxo5bQkU3yyJr54I1B3MPrBXysXwJMIBijr mwxCmISc2JSlW318mp1TZebnAH89auK88i/j4aarLrFPLUNwINk9nioPd39NHJ2J 60D3fmaenq/56AhxzB55 =SG58 -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-31: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.2'
Tag 'libreoffice-3.5.3.2' created by Petr Mladek at 2012-04-24 15:08 -0700 Tag 3.5.3.2 (3.5.3-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPlrPRAAoJEPQ0oe+v7q6jW64P/2HFosztvstIwt8bjjKsYFVU WnGqghglZCTDqtNgc7RLEII8RI1c4kC4ops2bTopPwubtcuOm4qcNjYn/MH+gVcr urwTxlt+okrkNmXuqW9QVMFsR9uFQQ5GhBEi3T/ywtmaQbtK7r93InaAxKOkULrN aXat4D4mdMDKCZut2kp0dqwEBZZKTDfkcMVCLFsnD4UF9YN1e3AwcrxFyt8LwgcM 3u7nT5ZpJLlz9agkjtPKtqzvNGiNo89mtc3Dy25lR2GHrUa12XH7r6b8QcEwxUW+ snJGoKSlRxjYGTtajd1o9EPTqPsnfRJEB2Bn3ZP8btkdSR3En2YbWdWom+xonECr jxi9WyFBCCJBKhIi+4kQAXspZvpPveLNnnLVtZiz9TAAA7PgV1xULy6NmU2P9WrW 1grleq1aH5uJAtCjNSpNwPNWp8TPm+57qYqhkTlVqigC3wtp6kpRM2BlPl2SxxUo ph/PUTGrEVVZOXxGdBMZfvDkqUtKnk7LgYEjVn4T+1nYVSpmieyDcey9PSZGsrUf YOXaVU0PSAZUV1igR3bCCP3sRldqkHqhcdklvkBYm95Q/x8OOQBHu/m1Tf3RLE2a zvoW1FqZSn7vVuqkS9hkrN94kbe2DkGIbjfsR5p6KgDcB5JtSXIGRPONOCKtq+QJ XWzcA4WXmcKcbpqp1P/D =rmR7 -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.2'
Tag 'libreoffice-3.5.3.2' created by Petr Mladek at 2012-04-24 15:08 -0700 Tag 3.5.3.2 (3.5.3-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPlrPRAAoJEPQ0oe+v7q6jSFcP/33N0oYAfvKQINor0c5bLmSQ nDGJ+47Jtht+AYHcpuGFkBGE/4zcGJiEd4Ear7eaFFrN7c9mPUVBy/wihjKI1qmK u8rc2gfLPLvUWfy8TP98t6+dqFvHXt7QcPQHN7WgmF61khk+Q09jRbYo7TluO/Vb d8/g8ka0LUpnz68R8fCCcLtf2wqGzce/cpcY6fCn1905jDbVutIxGbGks00bQjfu 9X7UyppgJCf+/VZABTclnREO8e8pfZgmZdK3cdjrsqtyuvw7otbkmY9GXGaXioNH qXm7aRvk6aWwVui7CZjqUrASdjS5siTu9pazUfGWTXLsOJCjzIOOOAVBqMLEXDr6 KRi2/5F4BObxEW1piOVo3F7H13KFabu55jGDkynfII4Xzi7Q2E6aiCObZCfTcM6y I5SXPMWCoVcMcxhnfCAbaan1tz+o5417+5Is+JOeU6x7qaJxgWeda6w3bxKCmRJB S/J2nrj8gMjcrleLmzBIvJ/hrnEyYoMnUYu+iB3Efwz8wcVg3T3coBZIZDqW6u4S 4Yhmw4nTZ05rzAHD+1Q7+nhNO7V1oee9MY0Mrb5hVajBlD/Ql9d0EzKh6urV2VDF 2zyx95i1S1qKEgSUI9OkhsoOnpCmiP25QDG4YsS/BunRUSZQfIaH0rC6nal9iuSL 4XdsOFCEmg/F2Bh0U9vt =KjJu -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-1089: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.6.patch libcdr/libcdr-0.0.7.patch libcdr/makefile.mk ooo.lst.in
libcdr/libcdr-0.0.6.patch | 20 libcdr/libcdr-0.0.7.patch | 20 libcdr/makefile.mk|4 ++-- ooo.lst.in|2 +- 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 17d08197761567f72f8b58c8aa71bac31701968e Author: Fridrich Å trba Date: Tue Apr 24 15:54:12 2012 +0200 uploading new shiny libcdr-0.0.7 release diff --git a/libcdr/libcdr-0.0.6.patch b/libcdr/libcdr-0.0.6.patch deleted file mode 100644 index d8bd05c..000 --- a/libcdr/libcdr-0.0.6.patch +++ /dev/null @@ -1,20 +0,0 @@ misc/libcdr-0.0.6/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 -+++ misc/build/libcdr-0.0.6/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 -@@ -54,17 +54,8 @@ - - #else - --#ifdef HAVE_CONFIG_H --#include --#endif -- --#ifdef HAVE_STDINT_H - #include --#endif -- --#ifdef HAVE_INTTYPES_H - #include --#endif - - #endif - diff --git a/libcdr/libcdr-0.0.7.patch b/libcdr/libcdr-0.0.7.patch new file mode 100644 index 000..40d021a --- /dev/null +++ b/libcdr/libcdr-0.0.7.patch @@ -0,0 +1,20 @@ +--- misc/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-07 13:51:21.0 +0100 misc/build/libcdr-0.0.7/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100 +@@ -54,17 +54,8 @@ + + #else + +-#ifdef HAVE_CONFIG_H +-#include +-#endif +- +-#ifdef HAVE_STDINT_H + #include +-#endif +- +-#ifdef HAVE_INTTYPES_H + #include +-#endif + + #endif + diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index cf8c414..85c8025 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -59,8 +59,8 @@ INCPRE+=$(LCMS2_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 .ENDIF -TARFILE_NAME=libcdr-0.0.6 -TARFILE_MD5=44d0c579b342f6cdbc0f76534c5d29b2 +TARFILE_NAME=libcdr-0.0.7 +TARFILE_MD5=c216ded0275129ccfef44fbc236ac16a PATCH_FILES=\ $(TARFILE_NAME).patch diff --git a/ooo.lst.in b/ooo.lst.in index 04dfa6b..170ee57 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz -44d0c579b342f6cdbc0f76534c5d29b2-libcdr-0.0.6.tar.bz2 +c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmlhelp/source
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 41135b6dd86200d125095749e044d593a0452c41 Author: Caolán McNamara Date: Tue Apr 24 14:24:09 2012 +0100 WaE: silence warnings from msvc2008 (again) diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index ca333ea..6134030 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -34,8 +34,18 @@ #include #include + +#if defined _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4068 4263 4264 4266) +#endif + #include +#if defined _MSC_VER +#pragma warning(pop) +#endif + #include #include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 81fb27c27bfbd7b1808bb442277476065e39fb56
Author: Stephan Bergmann
Date: Tue Apr 24 14:35:29 2012 +0200
-Werror=unused-variable
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8585a10..7662602 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4272,8 +4272,6 @@ void Test::testCopyPasteFormulasExternalDoc()
CPPUNIT_ASSERT_MESSAGE("external document instance not loaded.",
findLoadedDocShellByName(aExtDocName) != NULL);
-ScDocument* pExtDoc = xExtDocSh->GetDocument();
-
m_pDoc->InsertTab(0, "Sheet1");
m_pDoc->InsertTab(1, "Sheet2");
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - officecfg/registry
officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 60e4db7aa959133fdae5e9536c8c6e0ae9ab447b Author: Markus Mohrhard Date: Tue Apr 24 12:06:43 2012 +0200 default to Office 2007/2010 filter for ooxml export, fdo#48941 (cherry picked from commit f3d7d6ece96d74e55dc92babfd12812dfe1a4793) Signed-off-by: Michael Stahl Signed-off-by: Lubos Lunak Signed-off-by: Petr Mladek diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu index 4593983..e0d569d 100644 --- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu +++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu @@ -30,7 +30,7 @@ -calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;Calc Office Open XML;Calc Office Open XML Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery +calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open XML;Calc Office Open XML Template @@ -40,7 +40,7 @@ -impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile +impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template @@ -55,7 +55,7 @@ -writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 3.0;StarWriter 3.0 Vorlage/Template;T602Document;Text;Text (encoded);WordPerfect +writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWrite
[Libreoffice-commits] .: 2 commits - solenv/gbuild svl/source
solenv/gbuild/gbuild.mk |2 ++
svl/source/numbers/zforlist.cxx |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b8184381bfa5fce44560d01ee8f3ed321cef4bb5
Author: Stephan Bergmann
Date: Tue Apr 24 14:07:16 2012 +0200
Revert "Avoid bogus warnings (GCC 4.4.6)"
This reverts commit cf9c715aee2f97a1a6f611fe46a47e238cb03658.
3c82780cbc7cf17cf348e7f49b99663cfdc42ed7 "Set gb_DEBUGLEVEL=1 for
--enable-dbgutil after all" fixes the underlying problem, making this
awkward
workaround no longer necessary.
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 93007ab..83a1232 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1303,7 +1303,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short
nType )
if ( nDefaultFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
{ // look for a defined standard
sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET;
-sal_uInt32 nKey = 0; // avoid bogus warning (GCC 4.4.6)
+sal_uInt32 nKey;
SvNumberFormatTable::iterator it2 = aFTable.find( CLOffset );
while ( it2 != aFTable.end() && (nKey = it2->first ) >= CLOffset &&
nKey < nStopKey )
{
@@ -3326,7 +3326,7 @@ sal_uInt32
SvNumberFormatter::ImpGetDefaultCurrencyFormat()
{
// look for a defined standard
sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET;
-sal_uInt32 nKey = 0; // avoid bogus warning (GCC 4.4.6)
+sal_uInt32 nKey;
SvNumberFormatTable::iterator it2 = aFTable.lower_bound( CLOffset );
while ( it2 != aFTable.end() && (nKey = it2->first) >= CLOffset &&
nKey < nStopKey )
{
commit fc7a55fd3f2df0ffc9ea64751ebdc187a58b778c
Author: Stephan Bergmann
Date: Tue Apr 24 14:00:57 2012 +0200
Set gb_DEBUGLEVEL=1 for --enable-dbgutil after all
This is a partial revert of db8df57acd601ed084bd0122683e1bd066a4f143 "fixes
for
debug flags handling." Removing this caused various nastinesses, at least:
* Some tinderbox started to emit bogus compiler warnings at -O2 vs. -O0, see
cf9c715aee2f97a1a6f611fe46a47e238cb03658 "Avoid bogus warnings (GCC
4.4.6)"
* General DBG_UTIL vs. OSL_DEBUG_LEVEL confusion in the code, see
729165ebacc6ff8bd1e5c936252cdace1782824b "OSL_DEBUG_LEVEL > 0 -> defined
DBG_UTIL" and a7c7942fd1946da978673d2c350630f83603d18d "DBG_UTIL vs
OSL_DEBUG_LEVEL confusion"
* --enable-dbgutil would no longer prevent -DNDEBUG (i.e., assert became
ineffective in such builds)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 578393e..7d1d66e 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -99,6 +99,8 @@ endif
gb_DEBUGLEVEL := 0
ifneq ($(strip $(DEBUG)$(debug)),)
gb_DEBUGLEVEL := 1
+else ifeq ($(gb_PRODUCT),$(false))
+gb_DEBUGLEVEL := 1
endif
ifneq ($(strip $(DBGLEVEL)$(dbglevel)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - 2 commits - sw/source
sw/source/core/layout/paintfrm.cxx | 43 -
1 file changed, 33 insertions(+), 10 deletions(-)
New commits:
commit 32b854ee4a63da1be42294c5afe6c62e54ae72d3
Author: Michael Stahl
Date: Wed Apr 4 22:35:08 2012 +0200
fdo#45562: paint borders in SwFlyFrm::Paint:
Painting borders of Flys in the heaven layer cannot be done correctly in
SwRootFrm::Paint, because delaying until then paints over other drawing
objects that are on top of the frame, so do it in SwFlyFrm::Paint,
like the old border painting code used to.
(regression from 804d0a896731629397c5328c13c04a45bc55f459)
(cherry picked from commit 5913506b2193e93ca2767ab7365ab2e76ed7848f)
Signed-off-by: Caolán McNamara
Signed-off by: Miklos Vajna
Signed-off-by: Cédric Bosdonnat
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 435571a..1fd7013 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3031,8 +3031,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData
const*const pPrintData) const
if ( bExtraData )
pPage->RefreshExtraData( aPaintRect );
-// have to paint frame borders added in heaven layer here...
-ProcessPrimitives(g_pBorderLines->GetBorderLines_Clear());
DELETEZ(g_pBorderLines);
pVout->Leave();
@@ -3751,12 +3749,28 @@ void SwCellFrm::Paint(SwRect const& rRect, SwPrintData
const*const) const
void MA_FASTCALL lcl_PaintLowerBorders( const SwLayoutFrm *pLay,
const SwRect &rRect, const SwPageFrm *pPage );
+struct BorderLinesGuard
+{
+explicit BorderLinesGuard() : m_pBorderLines(g_pBorderLines)
+{
+g_pBorderLines = new BorderLines;
+}
+~BorderLinesGuard()
+{
+delete g_pBorderLines;
+g_pBorderLines = m_pBorderLines;
+}
+private:
+BorderLines *const m_pBorderLines;
+};
+
void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
{
//wegen der Ueberlappung von Rahmen und Zeichenobjekten muessen die
//Flys ihre Umrandung (und die der Innenliegenden) direkt ausgeben.
//z.B. #33066#
pLines->LockLines(sal_True);
+BorderLinesGuard blg; // this should not paint borders added from PaintBaBo
SwRect aRect( rRect );
aRect._Intersection( Frm() );
@@ -3966,6 +3980,8 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData
const*const) const
// and then unlock other lines.
pLines->PaintLines( pOut );
pLines->LockLines( sal_False );
+// have to paint frame borders added in heaven layer here...
+ProcessPrimitives(g_pBorderLines->GetBorderLines_Clear());
pOut->Pop();
commit 1a34e28c9f80542bb8c0b120421f7a02832ad038
Author: Michael Stahl
Date: Fri Mar 23 14:08:31 2012 +0100
fdo#42750 fdo#45562 fdo#47717: border paint ordering:
Paint borders after subsidiary lines and hell layer, but before heaven
layer.
(cherry picked from commit 1024c172a5bfb3d85a86fcf7a046aa2b03950edd)
Signed-off-by: Caolán McNamara
Signed-off-by: Miklos Vajna
Signed-off-by: Cédric Bosdonnat
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 69e32ff..435571a 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -231,9 +231,12 @@ public:
{
m_Lines.push_back(xLine);
}
-drawinglayer::primitive2d::Primitive2DSequence GetBorderLines() const
+drawinglayer::primitive2d::Primitive2DSequence GetBorderLines_Clear()
{
-return m_Lines.getAsConstList();
+::comphelper::SequenceAsVector<
+::drawinglayer::primitive2d::Primitive2DReference> lines;
+::std::swap(m_Lines, lines);
+return lines.getAsConstList();
}
};
@@ -3002,6 +3005,16 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData
const*const pPrintData) const
}
pLines->PaintLines( pSh->GetOut() );
+if ( pSh->GetWin() )
+{
+pSubsLines->PaintSubsidiary( pSh->GetOut(), pLines );
+DELETEZ( pSubsLines );
+DELETEZ( pSpecSubsLines );
+}
+// fdo#42750: delay painting these until after subsidiary lines
+// fdo#45562: delay painting these until after hell layer
+// fdo#47717: but do it before heaven layer
+ProcessPrimitives(g_pBorderLines->GetBorderLines_Clear());
if ( pSh->Imp()->HasDrawView() )
{
@@ -3018,14 +3031,8 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData
const*const pPrintData) const
if ( bExtraData )
pPage->RefreshExtraData( aPaintRect );
-if ( pSh->GetWin() )
-{
-pSubs
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 6441b280c34c55301df169577de24f25ed0280b4 Author: Markus Mohrhard Date: Tue Apr 24 12:06:43 2012 +0200 default to Office 2007/2010 filter for ooxml export, fdo#48941 (cherry picked from commit f3d7d6ece96d74e55dc92babfd12812dfe1a4793) Signed-off-by: Michael Stahl diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu index 4593983..e0d569d 100644 --- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu +++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu @@ -30,7 +30,7 @@ -calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;Calc Office Open XML;Calc Office Open XML Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery +calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open XML;Calc Office Open XML Template @@ -40,7 +40,7 @@ -impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile +impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template @@ -55,7 +55,7 @@ -writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 3.0;StarWriter 3.0 Vorlage/Template;T602Document;Text;Text (encoded);WordPerfect +writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Te
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/salinst.cxx |3 --
vcl/unx/gtk/app/gtkinst.cxx | 54 +++-
2 files changed, 43 insertions(+), 14 deletions(-)
New commits:
commit 658954e8b50fc264428402dc5a95b0d6f690d191
Author: Caolán McNamara
Date: Tue Apr 24 12:03:27 2012 +0100
Resolves: fdo#48011 writer idle-callbacks are halting when events pending
Writer does a lot of work, e.g. spell-checking, word counting etc. in
idle-callbacks. It halts work by checking for AnyInput, and if any input or
paint etc is pending the idle-callbacks stop. With gtk3 rework pending
events don't seem to be available quite right.
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 9bf80c4..cb11406 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -147,9 +147,8 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType)
Display *pDisplay = pData->GetSalDisplay()->GetDisplay();
sal_Bool bRet = sal_False;
-if( (nType & VCL_INPUT_TIMER) && mpXLib->CheckTimeout( false ) )
+if( (nType & VCL_INPUT_TIMER) && (mpXLib && mpXLib->CheckTimeout(false)) )
bRet = sal_True;
-
else if (XPending(pDisplay) )
{
PredicateReturn aInput;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 8cc92da..c78de14 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -27,6 +27,7 @@
/
+#include
#include
#include
#define GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -264,12 +265,11 @@ extern "C" {
return GDK_FILTER_CONTINUE;
}
-// And then again as they pop out of gdk and into gtk+
-
-static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+static sal_uInt16 categorizeEvent(const GdkEvent *pEvent)
{
sal_uInt16 nType = 0;
-switch( pEvent->type ) {
+switch( pEvent->type )
+{
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
@@ -291,8 +291,16 @@ extern "C" {
nType = VCL_INPUT_OTHER;
break;
}
-((GtkInstance *)data)->subtractEvent( nType );
+return nType;
+}
+
+// And then again as they pop out of gdk and into gtk+
+
+static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+{
+sal_uInt16 nType = categorizeEvent(pEvent);
+((GtkInstance *)data)->subtractEvent( nType );
gtk_main_do_event( pEvent );
}
}
@@ -623,16 +631,38 @@ bool GtkInstance::AnyInput( sal_uInt16 nType )
{
if( (nType & VCL_INPUT_TIMER) && IsTimerExpired() )
return true;
-else
+#if !GTK_CHECK_VERSION(3,0,0)
+bool bRet = X11SalInstance::AnyInput(nType);
+#else
+if (!gdk_events_pending())
+return false;
+
+if (nType == VCL_INPUT_ANY)
+return true;
+
+bool bRet = false;
+std::stack aEvents;
+GdkEvent *pEvent = NULL;
+while ((pEvent = gdk_event_get()))
{
-bool bRet = false;
-sal_uInt16 nShift = 1;
-for (int i = 0; i < 16; i++) {
-bRet |= (nType & nShift) && m_nAnyInput[i] > 0;
-nShift <<= 1;
+aEvents.push(pEvent);
+sal_uInt16 nEventType = categorizeEvent(pEvent);
+if ( (nEventType & nType) || ( ! nEventType && (nType &
VCL_INPUT_OTHER) ) )
+{
+bRet = true;
+break;
}
-return bRet;
}
+
+while (!aEvents.empty())
+{
+pEvent = aEvents.top();
+gdk_event_put(pEvent);
+gdk_event_free(pEvent);
+aEvents.pop();
+}
+#endif
+return bRet;
}
GenPspGraphics *GtkInstance::CreatePrintGraphics()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/extras/rtfexport/data/fdo38176.rtf |2 +-
sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
sw/source/filter/ww8/rtfexport.cxx | 11 +--
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit dfc7c67e464e57f5442365e193c56033af564d84
Author: Miklos Vajna
Date: Tue Apr 24 13:05:12 2012 +0200
fdo#38176 fix RTF export of non-breaking hyphen and optional hyphen
diff --git a/sw/qa/extras/rtfexport/data/fdo38176.rtf
b/sw/qa/extras/rtfexport/data/fdo38176.rtf
index c5126e4..baa4193 100644
--- a/sw/qa/extras/rtfexport/data/fdo38176.rtf
+++ b/sw/qa/extras/rtfexport/data/fdo38176.rtf
@@ -1,3 +1,3 @@
{\rtf1
-foo\~bar
+foo\~\_\-bar
\par}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 607a39a..5bab469 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -124,7 +124,7 @@ void RtfExportTest::testZoom()
void RtfExportTest::testFdo38176()
{
roundtrip("fdo38176.rtf");
-CPPUNIT_ASSERT_EQUAL(7, getLength());
+CPPUNIT_ASSERT_EQUAL(9, getLength());
}
CPPUNIT_TEST_SUITE_REGISTRATION(RtfExportTest);
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 15eec5e..8101125 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -924,8 +924,15 @@ OString RtfExport::OutChar(sal_Unicode c, int *pUCMode,
rtl_TextEncoding eDestEn
}
if (pStr) {
aBuf.append(pStr);
-if (c != 0xa0)
-aBuf.append(' ');
+switch (c)
+{
+case 0xa0:
+case 0x1e:
+case 0x1f:
+break;
+default:
+aBuf.append(' ');
+}
}
return aBuf.makeStringAndClear();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cppuhelper/source store/source
cppuhelper/source/defaultbootstrap.cxx |2 +-
store/source/makefile.mk |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f5a414d242f3b3bce19de4905d7b5dce9792b66c
Author: Caolán McNamara
Date: Tue Apr 24 10:41:58 2012 +0100
WaE: simple minded MSVC2008 thinks s could be used uninitialized
diff --git a/cppuhelper/source/defaultbootstrap.cxx
b/cppuhelper/source/defaultbootstrap.cxx
index f156ce1..f948586 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1370,7 +1370,7 @@ rtl::OUString ServiceManager::readLegacyRdbString(
{
RegistryKey subkey;
RegValueType t;
-sal_uInt32 s;
+sal_uInt32 s(0);
if (key.openKey(path, subkey) != REG_NO_ERROR
|| subkey.getValueInfo(rtl::OUString(), &t, &s) != REG_NO_ERROR
|| t != RG_VALUETYPE_STRING
commit a0d6c5dd9bf359d8428f26701acb6b2036b4417c
Author: Caolán McNamara
Date: Tue Apr 24 10:21:48 2012 +0100
WaE: MSVC2008 C4530 exception handler without unwind semantics
diff --git a/store/source/makefile.mk b/store/source/makefile.mk
index c7ae53d..4263a57 100644
--- a/store/source/makefile.mk
+++ b/store/source/makefile.mk
@@ -29,6 +29,7 @@ PRJ=..
PRJNAME=store
TARGET=store
+ENABLE_EXCEPTIONS=TRUE
# --- Settings ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/extras/rtfexport/data/fdo38176.rtf |3 +++
sw/qa/extras/rtfexport/rtfexport.cxx | 30 ++
sw/source/filter/ww8/rtfexport.cxx |3 ++-
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit ef7cc64d8b5044251d6e31ca24aeb0ac11818e5d
Author: Miklos Vajna
Date: Tue Apr 24 12:47:16 2012 +0200
fdo#38176 fix RTF export of non-breaking space
diff --git a/sw/qa/extras/rtfexport/data/fdo38176.rtf
b/sw/qa/extras/rtfexport/data/fdo38176.rtf
new file mode 100644
index 000..c5126e4
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo38176.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+foo\~bar
+\par}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 642544d..607a39a 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -26,6 +26,7 @@
*/
#include
+#include
#include
#include
@@ -44,15 +45,19 @@ public:
virtual void setUp();
virtual void tearDown();
void testZoom();
+void testFdo38176();
CPPUNIT_TEST_SUITE(RtfExportTest);
#if !defined(MACOSX) && !defined(WNT)
CPPUNIT_TEST(testZoom);
+CPPUNIT_TEST(testFdo38176);
#endif
CPPUNIT_TEST_SUITE_END();
private:
void roundtrip(const OUString& rURL);
+/// Get the length of the whole document.
+int getLength();
uno::Reference mxComponent;
};
@@ -69,6 +74,25 @@ void RtfExportTest::roundtrip(const OUString& rFilename)
mxComponent = loadFromDesktop(aTempFile.GetURL());
}
+int RtfExportTest::getLength()
+{
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum =
xParaEnumAccess->createEnumeration();
+OUStringBuffer aBuf;
+while (xParaEnum->hasMoreElements())
+{
+uno::Reference
xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
+uno::Reference xRangeEnum =
xRangeEnumAccess->createEnumeration();
+while (xRangeEnum->hasMoreElements())
+{
+uno::Reference xRange(xRangeEnum->nextElement(),
uno::UNO_QUERY);
+aBuf.append(xRange->getString());
+}
+}
+return aBuf.getLength();
+}
+
void RtfExportTest::setUp()
{
test::BootstrapFixture::setUp();
@@ -97,6 +121,12 @@ void RtfExportTest::testZoom()
CPPUNIT_ASSERT_EQUAL(sal_Int16(42), nValue);
}
+void RtfExportTest::testFdo38176()
+{
+roundtrip("fdo38176.rtf");
+CPPUNIT_ASSERT_EQUAL(7, getLength());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(RtfExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index d5a90ad..15eec5e 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -924,7 +924,8 @@ OString RtfExport::OutChar(sal_Unicode c, int *pUCMode,
rtl_TextEncoding eDestEn
}
if (pStr) {
aBuf.append(pStr);
-aBuf.append(' ');
+if (c != 0xa0)
+aBuf.append(' ');
}
return aBuf.makeStringAndClear();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 836d56dd563523853e4b9d4bbe7e6f93c1710a2a Author: Miklos Vajna Date: Tue Apr 24 12:30:41 2012 +0200 WaE: make MSVC happy wrt. RTFDocumentImpl::dispatchDestination() diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 750e473..50f84c4 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1062,7 +1062,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) // Look for the field type sal_Int32 nPos = Strm().Tell(); OStringBuffer aBuf; -char ch; +char ch = 0; bool bFoundCode = false; bool bInKeyword = false; while (!bFoundCode && ch != '}') ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source vbahelper/inc vbahelper/source
sc/source/ui/inc/preview.hxx | 10 +++---
sc/source/ui/inc/prevwsh.hxx |4 +-
sc/source/ui/vba/vbaworksheets.cxx | 48 +--
vbahelper/inc/vbahelper/vbahelper.hxx|1
vbahelper/source/vbahelper/vbahelper.cxx | 12 +--
5 files changed, 61 insertions(+), 14 deletions(-)
New commits:
commit 7ddb8f73c1a5573eedc593168f702287921ecb7a
Author: Noel Power
Date: Tue Apr 24 11:23:46 2012 +0100
tweak support Sheets.PrintPreview bnc#75784 allow specific sheet(s)
selection
this is a followup to commit 17c8f6745f9f98013c1b08de8ec03be66546c7fc
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index f926e1a..6482c05 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -130,13 +130,13 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
-voidDataChanged(bool bNewTime = false); // statt
Invalidate rufen
+SC_DLLPUBLIC voidDataChanged(bool bNewTime = false); //
statt Invalidate rufen
voidDoInvalidate();
voidSetXOffset( long nX );
voidSetYOffset( long nY );
voidSetZoom(sal_uInt16 nNewZoom);
-voidSetPageNo( long nPage );
+SC_DLLPUBLIC voidSetPageNo( long nPage );
boolGetPageMargins() const { return bPageMargin; }
voidSetPageMargins( bool bVal ) { bPageMargin = bVal; }
@@ -158,7 +158,7 @@ public:
boolAllTested() const { return bValid && nTabsTested >= nTabCount; }
sal_uInt16 GetOptimalZoom(bool bWidthOnly);
-longGetFirstPage(SCTAB nTab);
+SC_DLLPUBLIC longGetFirstPage(SCTAB nTab);
voidCalcAll() { CalcPages(); }
voidSetInGetState(bool bSet) { bInGetState = bSet; }
@@ -168,8 +168,8 @@ public:
FmFormView* GetDrawView() { return pDrawView; }
-void SetSelectedTabs(const ScMarkData& rMark);
-const ScMarkData::MarkedTabsType& GetSelectedTabs() const;
+SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark);
+SC_DLLPUBLIC const ScMarkData::MarkedTabsType& GetSelectedTabs() const;
};
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 1ac668a..0664c1e 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -90,7 +90,7 @@ protected:
virtual voidReadUserDataSequence (const
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&,
sal_Bool bBrowse = false );
public:
-TYPEINFO();
+TYPEINFO_VISIBILITY( SC_DLLPUBLIC );
SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScPreviewShell);
@@ -127,7 +127,7 @@ public:
const ScPreviewLocationData& GetLocationData();
ScDocument* GetDocument();
-ScPreview* GetPreview() { return pPreview; }
+SC_DLLPUBLIC ScPreview* GetPreview() { return pPreview; }
};
diff --git a/sc/source/ui/vba/vbaworksheets.cxx
b/sc/source/ui/vba/vbaworksheets.cxx
index 3d218fa..e952d9a 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -57,7 +57,8 @@
#include "markdata.hxx"
#include
-
+#include "prevwsh.hxx"
+#include "preview.hxx"
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -537,11 +538,52 @@ bool ScVbaWorksheets::nameExists( uno::Reference
&
return false;
}
-void ScVbaWorksheets::PrintPreview( const css::uno::Any& EnableChanges ) throw
(css::uno::RuntimeException)
+void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ )
throw (css::uno::RuntimeException)
{
// need test, print preview current active sheet
// !! TODO !! get view shell from controller
-PrintPreviewHelper( EnableChanges, excel::getBestViewShell( mxModel ) );
+ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel );
+SfxViewFrame* pViewFrame = NULL;
+if ( pViewShell )
+pViewFrame = pViewShell->GetViewFrame();
+if ( pViewFrame )
+{
+if ( !pViewFrame->GetFrame().IsInPlace() )
+{
+dispatchExecute( pViewShell, SID_VIEWSHELL1 );
+SfxViewShell* pShell = SfxViewShell::Get(
pViewFrame->GetFrame().GetFrameInterface()->getController() );
+
+if ( pShell->ISA( ScPreviewShell ) )
+{
+ScPreviewShell* pPrvShell = static_cast< ScPreviewShell* >(
pShell );
+ScPreview* pPrvView = pPrvShell->GetPreview();
+ScMarkData aMarkData;
+sal_Int32 nElems = getCount();
+for ( sal_Int32 nItem = 1; nItem <= nElems; ++nItem )
+{
+uno::Reference< excel::XWorksheet > xSheet( Item(
uno::makeAny( nItem ), uno::Any() ), uno::UNO_QUERY_THROW );
+ScVbaWorksheet* pSheet =
excel::getImplFromDocModuleWrapper( xSheet );
+if ( pSheet )
+
[Libreoffice-commits] .: solenv/bin
solenv/bin/create-tags |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 061e4e119cc932dadda976d2b8622f671201a6bd Author: Miklos Vajna Date: Tue Apr 24 12:25:22 2012 +0200 create-tags: config_host.mk reading diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index a61c5b6..0388928 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ -z "$INPATH" ] ; then - INPATH=$(grep "INPATH=" ./config_host.mk | sed -e "s/INPATH=//") + INPATH=$(grep "INPATH=" ./config_host.mk | sed -e "s/export INPATH=//") fi if [ -z "$INPATH" ] ; then echo "could not determine INPATH" >&2 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - officecfg/registry sc/qa
officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |6 - sc/qa/unit/ucalc.cxx| 45 +- 2 files changed, 47 insertions(+), 4 deletions(-) New commits: commit f3d7d6ece96d74e55dc92babfd12812dfe1a4793 Author: Markus Mohrhard Date: Tue Apr 24 12:06:43 2012 +0200 default to Office 2007/2010 filter for ooxml export, fdo#48941 diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu index 4593983..e0d569d 100644 --- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu +++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu @@ -30,7 +30,7 @@ -calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;Calc Office Open XML;Calc Office Open XML Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery +calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open XML;Calc Office Open XML Template @@ -40,7 +40,7 @@ -impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile +impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template @@ -55,7 +55,7 @@ -writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 3.0;StarWriter 3.0 Vorlage/Template;T602Document;Text;Text (encoded);WordPerfect +writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;StarWriter 5.0;StarWriter 5.0 Vorlage/Template;StarWriter 4.0;StarWriter 4.0 Vorlage/Template;StarWriter 3.0;StarWrite
[Libreoffice-commits] .: i18npool/inc i18npool/source svtools/source
i18npool/inc/i18npool/lang.h|2 +-
i18npool/source/isolang/isolang.cxx |2 +-
svtools/source/misc/langtab.src |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c5d1f72f0c8c07736ba675c807698bed0e0c4d28
Author: Eike Rathke
Date: Tue Apr 24 11:49:45 2012 +0200
it's Erzya, not Eryza
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 311db27..a74b3ef 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -542,7 +542,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_KOMI_PERMYAK 0x066A
#define LANGUAGE_USER_PITJANTJATJARA0x066B
#define LANGUAGE_USER_ENGLISH_MALAWI0x8809 /* makeLangID( 0x22,
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
-#define LANGUAGE_USER_ERYZA 0x066C
+#define LANGUAGE_USER_ERZYA 0x066C
#define LANGUAGE_USER_MARI_MEADOW 0x066D
#endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx
b/i18npool/source/isolang/isolang.cxx
index c24df3b..0509079 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -487,7 +487,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_KOMI_ZYRIAN, "kpv", "RU" },
{ LANGUAGE_USER_KOMI_PERMYAK, "koi", "RU" },
{ LANGUAGE_USER_PITJANTJATJARA,"pjt", "AU" },
-{ LANGUAGE_USER_ERYZA, "myv", "RU" },
+{ LANGUAGE_USER_ERZYA, "myv", "RU" },
{ LANGUAGE_USER_MARI_MEADOW, "mhr", "RU" },
{ LANGUAGE_NONE, "zxx", "" }, // added to ISO
639-2 on 2006-01-11: Used to declare the absence of linguistic information
{ LANGUAGE_DONTKNOW,"", "" }// marks end of
table
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index b1d83de..6ddac9e 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -348,7 +348,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Komi-Permyak" ; LANGUAGE_USER_KOMI_PERMYAK ; > ;
< "Pitjantjatjara" ; LANGUAGE_USER_PITJANTJATJARA ; > ;
< "English (Malawi)" ; LANGUAGE_USER_ENGLISH_MALAWI ; > ;
-< "Eryza" ; LANGUAGE_USER_ERYZA ; > ;
+< "Erzya" ; LANGUAGE_USER_ERZYA ; > ;
< "Mari, Meadow" ; LANGUAGE_USER_MARI_MEADOW ; > ;
};
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 49907807572a23c30db3ae02b6f3254dc44e393c Author: Tor Lillqvist Date: Tue Apr 24 12:43:41 2012 +0300 AC_MSG_ERROR is better than WARN here diff --git a/configure.in b/configure.in index 8a726ee..de31aec 100644 --- a/configure.in +++ b/configure.in @@ -8673,7 +8673,7 @@ AC_SUBST(SPLIT_OPT_FEATURES) if test $_os = Darwin -o $_os = WINNT; then if test "$enable_cairo_canvas" = yes; then -AC_MSG_WARN([Overriding with -disable-cairo-canvas for this platform]) +AC_MSG_ERROR([The cairo canvas should not be used for this platform]) fi enable_cairo_canvas=no elif test -z "$enable_cairo_canvas"; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/inc/unotxvw.hxx |4 ++--
sw/source/ui/uno/unotxvw.cxx | 29 ++---
2 files changed, 16 insertions(+), 17 deletions(-)
New commits:
commit 8533a191f4434490aa44118bce0e5719477d957a
Author: Noel Grandin
Date: Wed Apr 18 18:03:53 2012 +0200
Convert SV_DECL_PTRARR_DEL to boost::ptr_vector
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 5655b6c..c764c15 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -55,8 +55,8 @@
class SdrObject;
class SwView;
-typedef ::com::sun::star::uno::Reference<
::com::sun::star::view::XSelectionChangeListener > *
XSelectionChangeListenerPtr;
-SV_DECL_PTRARR_DEL( SelectionChangeListenerArr, XSelectionChangeListenerPtr, 4
)
+typedef ::com::sun::star::uno::Reference<
::com::sun::star::view::XSelectionChangeListener > XSelectionChangeListenerRef;
+typedef boost::ptr_vector
SelectionChangeListenerArr;
class SwXTextView :
public ::com::sun::star::view::XSelectionSupplier,
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index d96a47e..3cd93ac 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -97,8 +97,6 @@ using comphelper::HelperBaseNoState;
using ::rtl::OUString;
-SV_IMPL_PTRARR( SelectionChangeListenerArr, XSelectionChangeListenerPtr );
-
SwPaM* lcl_createPamCopy(const SwPaM& rPam)
{
SwPaM *const pRet = new SwPaM(*rPam.GetPoint());
@@ -141,23 +139,23 @@ void SwXTextView::Invalidate()
m_refCount++; //prevent second d'tor call
-sal_uInt16 nCount = aSelChangedListeners.Count();
+sal_uInt16 nCount = aSelChangedListeners.size();
if(nCount)
{
uno::Reference< uno::XInterface > xInt =
(cppu::OWeakObject*)(SfxBaseController*)this;
lang::EventObject aEvent(xInt);
for ( sal_uInt16 i = nCount; i--; )
{
-uno::Reference< view::XSelectionChangeListener > *pObj =
aSelChangedListeners[i];
+uno::Reference< view::XSelectionChangeListener > *pObj =
&aSelChangedListeners[i];
(*pObj)->disposing(aEvent);
}
}
// #i85580: now clean up any possibly remaining entries in the array...
// (i.e. listeners that did not call removeSelectionChangeListener in
their disposing.)
-while ((nCount = aSelChangedListeners.Count()) != 0)
+while ((nCount = aSelChangedListeners.size()) != 0)
{
-removeSelectionChangeListener( *aSelChangedListeners[0] );
+removeSelectionChangeListener( aSelChangedListeners[0] );
}
m_refCount--;
@@ -610,7 +608,7 @@ void SwXTextView::addSelectionChangeListener(
SolarMutexGuard aGuard;
uno::Reference< view::XSelectionChangeListener > * pInsert = new
uno::Reference< view::XSelectionChangeListener > ;
*pInsert = rxListener;
-aSelChangedListeners.Insert(pInsert, aSelChangedListeners.Count());
+aSelChangedListeners.push_back(pInsert);
}
void SwXTextView::removeSelectionChangeListener(
@@ -619,13 +617,14 @@ void SwXTextView::removeSelectionChangeListener(
{
SolarMutexGuard aGuard;
view::XSelectionChangeListener* pLeft = rxListener.get();
-for(sal_uInt16 i = 0; i < aSelChangedListeners.Count(); i++)
+for(SelectionChangeListenerArr::iterator it = aSelChangedListeners.begin();
+it != aSelChangedListeners.end(); ++it)
{
-uno::Reference< view::XSelectionChangeListener > * pElem =
aSelChangedListeners.GetObject(i);
- view::XSelectionChangeListener* pRight = pElem->get();
+uno::Reference< view::XSelectionChangeListener > * pElem = &*it;
+view::XSelectionChangeListener* pRight = pElem->get();
if(pLeft == pRight)
{
-aSelChangedListeners.Remove(i);
+aSelChangedListeners.erase(it);
delete pElem;
break;
}
@@ -885,10 +884,10 @@ void SwXTextView::NotifySelChanged()
lang::EventObject aEvent(xInt);
-sal_uInt16 nCount = aSelChangedListeners.Count();
+sal_uInt16 nCount = aSelChangedListeners.size();
for ( sal_uInt16 i = nCount; i--; )
{
-uno::Reference< view::XSelectionChangeListener > *pObj =
aSelChangedListeners[i];
+uno::Reference< view::XSelectionChangeListener > *pObj =
&aSelChangedListeners[i];
(*pObj)->selectionChanged(aEvent);
}
}
@@ -898,10 +897,10 @@ void SwXTextView::NotifyDBChanged()
URL aURL;
aURL.Complete =
rtl::OUString::createFromAscii(SwXDispatch::GetDBChangeURL());
-sal_uInt16 nCount = aSelChangedListeners.Count();
+sal_uInt16 nCount = aSelChangedListeners.size();
for ( sal_uInt16 i = nCount; i--; )
{
-uno::Reference< view::XSelectionChangeListener > *pObj =
aSelChangedListeners[i];
+uno::Reference< view::XSelectionChangeListener > *pObj =
&aSelChangedListeners[i];
uno::Reference xDispatch((*pObj), UNO_QUERY);
if(xDispatch.is())
xDisp
[Libreoffice-commits] .: 26 commits - avmedia/source basctl/source basic/source configure.in connectivity/source cppu/inc dbaccess/source distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOffi
avmedia/source/quicktime/player.mm|1 basctl/source/dlged/dlged.cxx |2 basic/source/basmgr/basmgr.cxx|2 configure.in | 15 ++- connectivity/source/commontools/makefile.mk |3 connectivity/source/cpool/makefile.mk |3 connectivity/source/drivers/ado/makefile.mk |4 connectivity/source/drivers/calc/makefile.mk |4 connectivity/source/drivers/dbase/makefile.mk |3 connectivity/source/drivers/file/makefile.mk |3 connectivity/source/drivers/flat/makefile.mk |3 connectivity/source/drivers/jdbc/makefile.mk |3 connectivity/source/drivers/mysql/makefile.mk |3 connectivity/source/drivers/odbc/makefile.mk |4 connectivity/source/manager/makefile.mk |3 connectivity/source/resource/makefile.mk |3 connectivity/source/sdbcx/makefile.mk |3 cppu/inc/com/sun/star/uno/Any.hxx | 12 +- dbaccess/source/ui/browser/unodatbr.cxx |7 + dbaccess/source/ui/misc/UITools.cxx | 22 ++--- dbaccess/source/ui/querydesign/JoinTableView.cxx |2 distro-configs/LibreOfficeMacOSX.conf |1 distro-configs/LibreOfficeWin32.conf |1 distro-configs/LibreOfficeWin64.conf |1 extensions/source/macosx/spotlight/OOoContentDataParser.m |1 extensions/source/macosx/spotlight/OOoMetaDataParser.m|1 fpicker/source/aqua/CFStringUtilities.hxx |2 pyuno/zipcore/makefile.mk |4 shell/source/unix/sysshell/makefile.mk|2 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx |2 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 44 -- slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.h |9 ++ slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m |4 vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 22 - vcl/aqua/source/dtrans/DropTarget.cxx |5 - vcl/aqua/source/gdi/aquaprintaccessoryview.mm |6 - vcl/aqua/source/gdi/aquaprintview.mm |1 vcl/aqua/source/gdi/salatslayout.cxx |4 vcl/aqua/source/gdi/salbmp.cxx|1 vcl/aqua/source/gdi/salgdiutils.cxx |2 vcl/aqua/source/window/salframeview.mm|2 vcl/inc/aqua/aquavcltypes.h |2 42 files changed, 71 insertions(+), 151 deletions(-) New commits: commit feb4ce887f37fa9208ea68f83eca68cb090c2ff6 Author: Tor Lillqvist Date: Tue Apr 24 10:52:32 2012 +0300 Use blank as the false value for ENABLE_CAIRO_CANVAS, too diff --git a/configure.in b/configure.in index c9f270b..8a726ee 100644 --- a/configure.in +++ b/configure.in @@ -8680,7 +8680,7 @@ elif test -z "$enable_cairo_canvas"; then enable_cairo_canvas=yes fi -ENABLE_CAIRO_CANVAS="FALSE" +ENABLE_CAIRO_CANVAS="" if test "$enable_cairo_canvas" = "yes"; then ENABLE_CAIRO_CANVAS="TRUE" fi commit 7e1516124bb05f9f40e1d724688b7b1a80327dfe Author: Tor Lillqvist Date: Tue Apr 24 10:41:59 2012 +0300 Hardcode cairo canvas off for Mac OS X and Windows Do not depend on a distro-configs file to disable it. It is supposed to be optional to pass a --with-distro option. Running a bare ./autogen.sh is supposed to produce a working configuration. diff --git a/configure.in b/configure.in index a1568ec..c9f270b 100644 --- a/configure.in +++ b/configure.in @@ -702,7 +702,7 @@ AC_ARG_ENABLE(split-opt-features, AC_ARG_ENABLE(cairo-canvas, [ --disable-cairo-canvas Determines whether to build the Cairo canvas on platforms where Cairo is available. -],,enable_cairo_canvas=yes) +]) AC_ARG_ENABLE(librsvg, AS_HELP_STRING([--enable-librsvg=], @@ -8671,9 +8671,18 @@ if test "$enable_split_opt_features" = "yes"; then fi AC_SUBST(SPLIT_OPT_FEATURES) +if test $_os = Darwin -o $_os = WINNT; then +if test "$enable_cairo_canvas" = yes; then +AC_MSG_WARN([Overriding with -disable-cairo-canvas for this platform]) +fi +enable_cairo_canvas=no +elif test -z "$enable_cairo_canvas"; then +enable_cairo_canvas=yes +fi + ENABLE_CAIRO_CANVAS="FALSE"
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - ooo.lst.in openssl/makefile.mk openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/op
ooo.lst.in |2 +- openssl/makefile.mk | 16 openssl/openssl.patch | 24 openssl/opensslios.patch|4 ++-- openssl/openssllnx.patch| 28 ++-- openssl/opensslmacosx.patch | 12 ++-- openssl/opensslmingw.patch | 16 openssl/opensslsol.patch| 28 ++-- openssl/version.mk |4 ++-- 9 files changed, 67 insertions(+), 67 deletions(-) New commits: commit 9d646e9e331ca23853ec04d044ae8c1ea42346e3 Author: Petr Mladek Date: Mon Apr 23 10:37:37 2012 +0200 update internal openssl to version 0.9.8v including important bug fixes Signed-off-by: Fridrich Strba (cherry picked from commit 696bd00021e3e959ed8b4854611799cda96f187d) Signed-off-by: Caolán McNamara diff --git a/ooo.lst.in b/ooo.lst.in index 0e493e2..408e0ee 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,6 +1,6 @@ http://dev-www.libreoffice.org/src 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 diff --git a/openssl/makefile.mk b/openssl/makefile.mk index f537838..eb4f455 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -46,10 +46,10 @@ TARGET=openssl @echo "openssl disabled" .ENDIF -OPENSSL_NAME=openssl-0.9.8o +OPENSSL_NAME=openssl-0.9.8v TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce CONFIGURE_DIR=. CONFIGURE_ACTION=config @@ -75,8 +75,8 @@ UNAME=$(shell uname) .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map .IF "$(CPU)" == "I" .IF "$(UNAME)" == "GNU/kFreeBSD" CONFIGURE_ACTION=Configure debian-kfreebsd-i386 @@ -93,15 +93,15 @@ UNAME=$(shell uname) CONFIGURE_ACTION=Configure linux-generic32 .ENDIF # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \" -#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' +#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map' .ENDIF .IF "$(OS)" == "SOLARIS" PATCH_FILES=opensslsol.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map -#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8e.map' +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map +#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8v.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 88f7088..538b2c1 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -9,8 +9,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -20,8 +20,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200 -+++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 +--- misc/openssl-0.9.8v/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200 misc/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 @@ -1,11 +1,11 @@ -perl util\mkfiles.pl >MINFO @@ -43,8 +43,8 @@ -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def +%1 util\mkdef.pl 32 libeay > ms\libeay32.def +%
[Libreoffice-commits] .: sw/source
sw/source/core/bastyp/swcache.cxx| 18 +-
sw/source/core/crsr/crsrsh.cxx |7 +--
sw/source/core/doc/docredln.cxx |8
sw/source/core/layout/calcmove.cxx |8
sw/source/core/layout/ftnfrm.cxx | 12 ++--
sw/source/core/table/swnewtable.cxx | 26 +-
sw/source/core/text/txtio.cxx|4 +---
sw/source/filter/writer/wrtswtbl.cxx |2 +-
8 files changed, 39 insertions(+), 46 deletions(-)
New commits:
commit a7c7942fd1946da978673d2c350630f83603d18d
Author: Stephan Bergmann
Date: Tue Apr 24 11:05:51 2012 +0200
DBG_UTIL vs OSL_DEBUG_LEVEL confusion
diff --git a/sw/source/core/bastyp/swcache.cxx
b/sw/source/core/bastyp/swcache.cxx
index 78e2960..9c0187f 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -49,8 +49,8 @@ void SwCache::Check()
return;
//Konsistenspruefung.
-OSL_ENSURE( !pLast->GetNext(), "Last but not last." );
-OSL_ENSURE( !pRealFirst->GetPrev(), "First but not first." );
+SAL_WARN_IF( pLast->GetNext(), "sw", "Last but not last." );
+SAL_WARN_IF( pRealFirst->GetPrev(), "sw", "First but not first." );
sal_uInt16 nCnt = 0;
sal_Bool bFirstFound = sal_False;
SwCacheObj *pObj = pRealFirst;
@@ -61,20 +61,20 @@ void SwCache::Check()
SwCacheObj *pTmp = pLast;
while ( pTmp && pTmp != pObj )
pTmp = pTmp->GetPrev();
-OSL_ENSURE( pTmp, "Objekt not found." );
+SAL_WARN_IF( !pTmp, "sw", "Objekt not found." );
++nCnt;
if ( pObj == pFirst )
bFirstFound = sal_True;
if ( !pObj->GetNext() )
-OSL_ENSURE( pObj == pLast, "Last not Found." );
+SAL_WARN_IF( pObj != pLast, "sw", "Last not Found." );
pObj = pObj->GetNext();
-OSL_ENSURE( pObj != pRekursive, "Recursion in SwCache." );
+SAL_WARN_IF( pObj == pRekursive, "sw", "Recursion in SwCache." );
}
-OSL_ENSURE( bFirstFound, "First not Found." );
-OSL_ENSURE( (nCnt + aFreePositions.size()) == Count(), "Lost Chain." );
-OSL_ENSURE(
-Count() != nCurMax || nCurMax == aFreePositions.size() + nCnt,
+SAL_WARN_IF( !bFirstFound, "sw", "First not Found." );
+SAL_WARN_IF( nCnt + aFreePositions.size() != Count(), "sw", "Lost Chain."
);
+SAL_WARN_IF(
+Count() == nCurMax && nCurMax != aFreePositions.size() + nCnt, "sw",
"Lost FreePositions." );
}
#endif
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 6a1f2bb..88fd062 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1254,12 +1254,7 @@ static void lcl_CheckHiddenSection( SwNodeIndex& rIdx )
SwNodeIndex aTmp( *pSectNd );
const SwNode* pFrmNd =
rIdx.GetNodes().FindPrvNxtFrmNode( aTmp, pSectNd->EndOfSectionNode() );
-
-#ifndef DBG_UTIL
-(void) pFrmNd;
-#else
-OSL_ENSURE( pFrmNd, "found no Node with Frames" );
-#endif
+SAL_WARN_IF( !pFrmNd, "sw", "found no Node with Frames" );
rIdx = aTmp;
}
}
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 5ca28ec..c68f85d 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -119,12 +119,12 @@ TYPEINIT1(SwRedlineHint, SfxHint);
const SwRedline* pCurrent = rTbl[ n ];
// check redline sorting
-OSL_ENSURE( *pPrev->Start() <= *pCurrent->Start(),
-_ERROR_PREFIX "not sorted correctly" );
+SAL_WARN_IF( *pPrev->Start() > *pCurrent->Start(), "sw",
+ _ERROR_PREFIX "not sorted correctly" );
// check for overlapping redlines
-OSL_ENSURE( *pPrev->End() <= *pCurrent->Start(),
-_ERROR_PREFIX "overlapping redlines" );
+SAL_WARN_IF( *pPrev->End() > *pCurrent->Start(), "sw",
+ _ERROR_PREFIX "overlapping redlines" );
}
}
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index eeccc20..b049913 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1147,14 +1147,14 @@ void SwCntntFrm::MakeAll()
const SwDoc *pDoc = GetAttrSet()->GetDoc();
if( pDoc )
{
-static sal_Bool bWarn = sal_False;
+static sal_Bool bWarned = sal_False;
if( pDoc->InXMLExport() )
{
-OSL_ENSURE( bWarn, "Formatting during XML-export!" );
-bWarn = sal_True;
+SAL_WARN_IF( !bWarned, "sw", "Formatting during XML-export!" );
+bWarned = sal_True;
}
else
-bWarn = sal_False;
+bWarned = sal_False;
}
#endif
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 940bc11..38e3ee8 100644
--- a/sw/source/core/layout/ftnfrm.c
[Libreoffice-commits] .: 2 commits - wizards/com wizards/Jar_reportbuilder.mk
wizards/Jar_reportbuilder.mk |2 +- wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF |1 + wizards/com/sun/star/wizards/reportbuilder/Manifest.mf |2 -- 3 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 4e435cdd0700fd3319fe72a966032a3245dddfcd Author: LuboÅ¡ LuÅák Date: Tue Apr 24 10:46:07 2012 +0200 consistent MANIFEST.MF naming diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk index d6f9dae..d190874 100644 --- a/wizards/Jar_reportbuilder.mk +++ b/wizards/Jar_reportbuilder.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Jar_use_jars,reportbuilderwizard,\ $(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com)) -$(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf)) +$(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF)) $(eval $(call gb_Jar_set_jarclasspath,reportbuilderwizard,\ commonwizards.jar \ diff --git a/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF b/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF new file mode 100644 index 000..8b13789 --- /dev/null +++ b/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF @@ -0,0 +1 @@ + diff --git a/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf b/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf deleted file mode 100644 index 8b13789..000 --- a/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf +++ /dev/null @@ -1 +0,0 @@ - commit 709969965496a5aef1a707e9483cb75a604ca526 Author: LuboÅ¡ LuÅák Date: Tue Apr 24 10:45:16 2012 +0200 remove duplicate Class-Path entry It's already set by Jar_reportbuilder.mk . diff --git a/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf b/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf index 53dbd34..8b13789 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf +++ b/wizards/com/sun/star/wizards/reportbuilder/Manifest.mf @@ -1,2 +1 @@ -Class-Path: report.jar commonwizards.jar ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/office/iodlgimp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 729165ebacc6ff8bd1e5c936252cdace1782824b
Author: Stephan Bergmann
Date: Tue Apr 24 10:43:44 2012 +0200
OSL_DEBUG_LEVEL > 0 -> defined DBG_UTIL
diff --git a/fpicker/source/office/iodlgimp.cxx
b/fpicker/source/office/iodlgimp.cxx
index 99797da..c815840 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -340,7 +340,7 @@ void SvtExpFileDlg_Impl::SetStandardDir( const String&
_rDir )
}
//*
-#if OSL_DEBUG_LEVEL > 0
+#if defined DBG_UTIL
//-
namespace {
String lcl_DecoratedFilter( const String& _rOriginalFilter )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - editeng/source sc/inc sc/source unusedcode.easy
editeng/source/editeng/editdoc.cxx |5 -
editeng/source/editeng/editdoc.hxx |1 -
sc/inc/chartlis.hxx|2 --
sc/source/core/tool/chartlis.cxx | 15 ---
unusedcode.easy|2 --
5 files changed, 25 deletions(-)
New commits:
commit 93a6aeb965c2d77767178e62475378f69b326414
Author: Santiago Martinez
Date: Mon Apr 23 19:37:15 2012 +0200
Remove unused code in sc.
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 3a92519..2c7a0b7 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -88,8 +88,6 @@ private:
public:
ScChartListener( const rtl::OUString& rName, ScDocument* pDoc,
- const ScRange& rRange );
-ScChartListener( const rtl::OUString& rName, ScDocument* pDoc,
const ScRangeListRef& rRangeListRef );
ScChartListener( const rtl::OUString& rName, ScDocument* pDoc,
::std::vector* pTokens );
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 79da0c9..c655eba 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -120,21 +120,6 @@ boost::unordered_set&
ScChartListener::ExternalRefListener::getAllFi
//
ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument*
pDocP,
-const ScRange& rRange ) :
-SvtListener(),
-mpExtRefListener(NULL),
-mpTokens(new vector),
-maName(rName),
-pUnoData( NULL ),
-pDoc( pDocP ),
-bUsed( false ),
-bDirty( false ),
-bSeriesRangesScheduled( false )
-{
-SetRangeList( rRange );
-}
-
-ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument*
pDocP,
const ScRangeListRef& rRangeList ) :
SvtListener(),
mpExtRefListener(NULL),
diff --git a/unusedcode.easy b/unusedcode.easy
index e10c47b..b4fd869 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -35,7 +35,6 @@ ScAddInDocs::Insert(ScAddInDocs const*, unsigned short,
unsigned short)
ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
ScAddInDocs::Insert(ScDocument* const*, unsigned short)
ScAddInDocs::Remove(ScDocument* const&, unsigned short)
-ScChartListener::ScChartListener(rtl::OUString const&, ScDocument*, ScRange
const&)
ScChartListener::SetName(rtl::OUString const&)
ScCompressedArray::GetEntryCount() const
ScCompressedArray::CopyFrom(ScCompressedArray const&, int, int, long)
commit 444e47bfdd8df18f8e37d0271dc1d48e55cc9c12
Author: Vicent Vendrell
Date: Mon Apr 23 16:43:30 2012 +0200
Removed unused code from editeng
Committer:Vicent Vendrell
On branch master
modified: editeng/source/editeng/editdoc.cxx
modified: editeng/source/editeng/editdoc.hxx
modified: unusedcode.easy
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 23549a7..110daf5 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2711,11 +2711,6 @@ size_t CharAttribList::Count() const
return aAttribs.size();
}
-void CharAttribList::Clear()
-{
-aAttribs.clear();
-}
-
const EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich,
sal_uInt16 nPos ) const
{
// Backwards, if one ends where the next starts.
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index 531652c..8dfe4f6 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -236,7 +236,6 @@ public:
voidOptimizeRanges( SfxItemPool& rItemPool );
size_t Count() const;
-void Clear();
voidInsertAttrib( EditCharAttrib* pAttrib );
diff --git a/unusedcode.easy b/unusedcode.easy
index e1cd14b..e10c47b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,4 @@
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence, com::sun::star::uno::Sequence, unsigned char)
-CharAttribList::Clear()
Dialog::Dialog(Window*, ResId const&)
EditEngine::GetNextVisPortion(ParaPortion const*) const
FmFieldWinMgr::GetChildWindowId()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in | 66 +--
1 file changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 2bbbd615d6a3bab89a6df7d7f0d2bb62e3781b43
Author: LuboÅ¡ LuÅák
Date: Tue Apr 24 10:11:30 2012 +0200
move the GXX_INCLUDE_PATH so that it's more obvious it's only for STLPort
diff --git a/configure.in b/configure.in
index 867a534..a1568ec 100644
--- a/configure.in
+++ b/configure.in
@@ -4257,39 +4257,6 @@ fi
AC_SUBST([VALGRIND_CFLAGS])
dnl ===
-dnl Set the gcc/gxx include directories
-dnl ===
-# Removed the special FreeBSD treatment. The problem was that
with_gxx_include_path
-# often contains an i386 which is expanded as a macro.
-if test "$GXX" = "yes"; then
-AC_MSG_CHECKING([for g++ include path])
-if test -z "$with_gxx_include_path"; then
-with_gxx_include_path=`echo "#include " | $CXX -E -xc++ -
2>/dev/null | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
-with_gxx_include_path="/usr/include"
-fi
-if echo $with_gxx_include_path | $GREP -q linux; then
-# workaround for Mandriva - issue 100049
-with_gxx_include_path=`cd -P $with_gxx_include_path && pwd`
-fi
-fi
-dnl This is the original code...
-dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{
print \$2 }'`/include
-if test -z "$with_gxx_include_path"; then
-with_gxx_include_path="NO_GXX_INCLUDE"
-AC_MSG_RESULT([none])
-else
-PathFormat "$with_gxx_include_path"
-with_gxx_include_path="$formatted_path"
-AC_MSG_RESULT([$with_gxx_include_path])
-fi
-else
-with_gxx_include_path="NO_GXX_INCLUDE"
-fi
-GXX_INCLUDE_PATH="$with_gxx_include_path"
-AC_SUBST(GXX_INCLUDE_PATH)
-
-dnl ===
dnl Set the MinGW include directories
dnl ===
if test "$WITH_MINGW" = "yes"; then
@@ -4447,6 +4414,39 @@ fi
AC_SUBST(WITH_STLPORT)
dnl ===
+dnl gxx include directories needed by STLPort
+dnl ===
+# Removed the special FreeBSD treatment. The problem was that
with_gxx_include_path
+# often contains an i386 which is expanded as a macro.
+if test "$GXX" = "yes"; then
+AC_MSG_CHECKING([for g++ include path])
+if test -z "$with_gxx_include_path"; then
+with_gxx_include_path=`echo "#include " | $CXX -E -xc++ -
2>/dev/null | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
+with_gxx_include_path="/usr/include"
+fi
+if echo $with_gxx_include_path | $GREP -q linux; then
+# workaround for Mandriva - issue 100049
+with_gxx_include_path=`cd -P $with_gxx_include_path && pwd`
+fi
+fi
+dnl This is the original code...
+dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{
print \$2 }'`/include
+if test -z "$with_gxx_include_path"; then
+with_gxx_include_path="NO_GXX_INCLUDE"
+AC_MSG_RESULT([none])
+else
+PathFormat "$with_gxx_include_path"
+with_gxx_include_path="$formatted_path"
+AC_MSG_RESULT([$with_gxx_include_path])
+fi
+else
+with_gxx_include_path="NO_GXX_INCLUDE"
+fi
+GXX_INCLUDE_PATH="$with_gxx_include_path"
+AC_SUBST(GXX_INCLUDE_PATH)
+
+dnl ===
dnl thread-safe statics
dnl ===
AC_MSG_CHECKING([whether $CXX supports thread safe statics])
commit 7874eb15ee7b1be90570ea5a5b60004462979f08
Author: LuboÅ¡ LuÅák
Date: Tue Apr 24 09:55:07 2012 +0200
do not cd get confused by symlinks
diff --git a/configure.in b/configure.in
index d8a1611..867a534 100644
--- a/configure.in
+++ b/configure.in
@@ -4270,7 +4270,7 @@ if test "$GXX" = "yes"; then
fi
if echo $with_gxx_include_path | $GREP -q linux; then
# workaround for Mandriva - issue 100049
-with_gxx_include_path=`cd $with_gxx_include_path && pwd`
+with_gxx_include_path=`cd -P $with_gxx_include_path && pwd`
fi
fi
dnl This is the original code...
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source unusedcode.easy
sw/source/ui/dbui/maildispatcher.cxx |8
sw/source/ui/inc/maildispatcher.hxx |5 -
unusedcode.easy |1 -
3 files changed, 14 deletions(-)
New commits:
commit 78aa62bc54e67b4552c18ae67be9789be5ef2409
Author: Santiago Martinez
Date: Tue Apr 24 08:52:28 2012 +0100
Remove unused code in sw
diff --git a/sw/source/ui/dbui/maildispatcher.cxx
b/sw/source/ui/dbui/maildispatcher.cxx
index 5e0f9e5..3eb6632 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/ui/dbui/maildispatcher.cxx
@@ -208,14 +208,6 @@ void
MailDispatcher::addListener(::rtl::Reference liste
listeners_.push_back(listener);
}
-void MailDispatcher::removeListener(::rtl::Reference
listener)
-{
-OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down
already");
-
-::osl::MutexGuard guard(listener_container_mutex_);
-listeners_.remove(listener);
-}
-
std::list< ::rtl::Reference >
MailDispatcher::cloneListener()
{
::osl::MutexGuard guard(listener_container_mutex_);
diff --git a/sw/source/ui/inc/maildispatcher.hxx
b/sw/source/ui/inc/maildispatcher.hxx
index ad5521d..d11d58f 100644
--- a/sw/source/ui/inc/maildispatcher.hxx
+++ b/sw/source/ui/inc/maildispatcher.hxx
@@ -136,11 +136,6 @@ public:
*/
void addListener(::rtl::Reference listener);
-/**
-Unregister a listener for mail dispatcher events
-*/
-void removeListener(::rtl::Reference listener);
-
protected:
virtual void SAL_CALL run();
virtual void SAL_CALL onTerminated();
diff --git a/unusedcode.easy b/unusedcode.easy
index a96ce89..e1cd14b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -22,7 +22,6 @@ MSDffImportRecords::Insert(SvxMSDffImportRec* const&,
unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
MSDffImportRecords::Remove(unsigned short, unsigned short)
-MailDispatcher::removeListener(rtl::Reference)
Matrix3d::Inverse() const
Matrix3d::Matrix3d()
PopupMenu::SetSelectedEntry(unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - vcl/source
vcl/source/gdi/pngread.cxx | 27 +++
1 file changed, 19 insertions(+), 8 deletions(-)
New commits:
commit c4088ad4ef53284af8136cca5eab7714307ce152
Author: Caolán McNamara
Date: Thu Apr 19 20:46:59 2012 +0100
fail earlier on oversized images
Signed-off-by: Petr Mladek
Signed-off-by: Michael Meeks
Signed-off-by: Miklos Vajna
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 1c590b5..2302e33 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -620,14 +620,6 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size&
rPreviewSizeHint )
mnScansize = static_cast< sal_uInt32 >( nScansize64 );
-// TODO: switch between both scanlines instead of copying
-mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
-mpScanCurrent = mpInflateInBuf;
-mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
-
-if ( !mpInflateInBuf || !mpScanPrior )
-return sal_False;
-
// calculate target size from original size and the preview hint
if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() )
{
@@ -662,6 +654,25 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size&
rPreviewSizeHint )
maTargetSize.Width() = (maOrigSize.Width() + mnPreviewMask) >>
mnPreviewShift;
maTargetSize.Height() = (maOrigSize.Height() + mnPreviewMask) >>
mnPreviewShift;
+//round bits up to nearest multiple of 8 and divide by 8 to get num of
bytes per pixel
+int nBytesPerPixel = ((mnTargetDepth + 7) & ~7)/8;
+
+//stupidly big, forget about it
+if (maTargetSize.Width() >= SAL_MAX_INT32 / nBytesPerPixel /
maTargetSize.Height())
+{
+SAL_WARN( "vcl", "overlarge png dimensions: " <<
+maTargetSize.Width() << " x " << maTargetSize.Height() << " depth:
" << mnTargetDepth);
+return sal_False;
+}
+
+// TODO: switch between both scanlines instead of copying
+mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ];
+mpScanCurrent = mpInflateInBuf;
+mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ];
+
+if ( !mpInflateInBuf || !mpScanPrior )
+return sal_False;
+
mpBmp = new Bitmap( maTargetSize, mnTargetDepth );
mpAcc = mpBmp->AcquireWriteAccess();
if( !mpAcc )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oowintool
oowintool | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 1f9b45377039f5839f8ee4dde265a297ec146062
Author: Andras Timar
Date: Tue Apr 24 09:24:49 2012 +0200
fdo#48259 take MSMDir from registry
diff --git a/oowintool b/oowintool
index 06e6607..3b8d763 100755
--- a/oowintool
+++ b/oowintool
@@ -274,17 +274,9 @@ sub msvc_copy_msms($$)
{
# $postfix is empty for x86, and '_x64' for x64
my ($dest, $postfix) = @_;
-my $common_files_path = $ENV{"CommonProgramFiles(x86)"};
-if (!defined $common_files_path) {
-$common_files_path = $ENV{CommonProgramFiles};
-if (!defined $common_files_path) {
-$common_files_path = "C:\\Program Files\\Common Files";
-}
-}
-
-defined $common_files_path || die "Windows CommonProgramFiles not found";
-my $msm_path = (cygpath $common_files_path . "\\Merge Modules", 'w',
$output_format);
+my $msm_path = (cygpath reg_get_value
("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"),
'w', $output_format);
+defined $msm_path || die "MSMDir not found";
foreach $fname ("Microsoft_VC90_CRT_x86$postfix.msm",
"policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm") {
print STDERR "Copying $msm_path/$fname to $dest\n";
copy ("$msm_path/$fname", $dest) || die "copy failed: $!";
___
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
sc/inc/dpitemdata.hxx |2 --
sc/source/core/data/dpitemdata.cxx |9 -
unusedcode.easy|2 --
3 files changed, 13 deletions(-)
New commits:
commit 858646a5eb5eae8703cfb64cd1cdbc553699a224
Author: Santiago Martinez
Date: Mon Apr 23 19:24:37 2012 +0200
Remove unused code in dpitemdata.
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 1996d68..46642a9 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -87,7 +87,6 @@ public:
ScDPItemData();
ScDPItemData(const ScDPItemData& r);
ScDPItemData(const rtl::OUString& rStr);
-ScDPItemData(const rtl::OUString* pStr);
ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue);
~ScDPItemData();
@@ -98,7 +97,6 @@ public:
void SetRangeStart(double fVal);
void SetRangeFirst();
void SetRangeLast();
-void SetErrorString(const rtl::OUString& rS);
void SetErrorString(const rtl::OUString* pS);
bool IsCaseInsEqual(const ScDPItemData& r) const;
diff --git a/sc/source/core/data/dpitemdata.cxx
b/sc/source/core/data/dpitemdata.cxx
index 83ca357..1bcc3a6 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -121,9 +121,6 @@ void ScDPItemData::DisposeString()
ScDPItemData::ScDPItemData(const rtl::OUString& rStr) :
mpString(new rtl::OUString(rStr)), meType(String), mbStringInterned(false)
{}
-ScDPItemData::ScDPItemData(const rtl::OUString* pStr) :
-mpString(pStr), meType(String), mbStringInterned(true) {}
-
ScDPItemData::ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue) :
meType(GroupValue), mbStringInterned(false)
{
@@ -184,12 +181,6 @@ void ScDPItemData::SetRangeLast()
meType = RangeStart;
}
-void ScDPItemData::SetErrorString(const rtl::OUString& rS)
-{
-SetString(rS);
-meType = Error;
-}
-
void ScDPItemData::SetErrorString(const rtl::OUString* pS)
{
SetString(pS);
diff --git a/unusedcode.easy b/unusedcode.easy
index 046ba9a..a96ce89 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -56,8 +56,6 @@ ScConditionalFormats_Impl::Remove(unsigned short, unsigned
short)
ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator > >,
std::__debug::vector > >, ScDBData>)
ScDBCollection::AnonDBs::findByTable(short) const
-ScDPItemData::ScDPItemData(rtl::OUString const*)
-ScDPItemData::SetErrorString(rtl::OUString const&)
ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
ScDPObject::HasGroups() const
ScDocRowHeightUpdater::TabRanges::TabRanges()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - clucene/Module_clucene.mk config_host.mk.in configure.in Makefile smoketest/CppunitTest_smoketest.mk solenv/bin solenv/gbuild solenv/inc
Makefile | 11 ++-
clucene/Module_clucene.mk |4
config_host.mk.in |1 +
configure.in |5 +
smoketest/CppunitTest_smoketest.mk |4 ++--
solenv/bin/install-gdb-printers|2 +-
solenv/gbuild/Module.mk|2 +-
solenv/gbuild/platform/macosx.mk |2 +-
solenv/gbuild/platform/solaris.mk |8
solenv/gbuild/platform/unxgcc.mk |8
solenv/inc/installationtest.mk |2 +-
11 files changed, 30 insertions(+), 19 deletions(-)
New commits:
commit 77f19d6e024006dac4434f60a377543314dbf261
Author: LuboÅ¡ LuÅák
Date: Tue Apr 24 08:57:49 2012 +0200
specific variable for where dev-install installs
diff --git a/Makefile b/Makefile
index 79f39aa..eb800e4 100644
--- a/Makefile
+++ b/Makefile
@@ -302,6 +302,7 @@ $(eval $(call dmake_modules_rules,$(dmake_modules)))
clean: clean-host clean-build
clean-host:
+ rm -fr $(DEVINSTALLDIR)
rm -fr $(SRCDIR)/*/$(INPATH)
rm -fr install
@@ -431,15 +432,15 @@ install:
echo "$(INSTALLDIR)/program/soffice"
dev-install: build
- @rm -rf $(OUTDIR)/installation
- @mkdir $(OUTDIR)/installation
+ @rm -rf $(DEVINSTALLDIR)
+ @mkdir $(DEVINSTALLDIR)
ifeq ($(DISABLE_LINKOO),TRUE)
- @ooinstall $(OUTDIR)/installation/opt
+ @ooinstall $(DEVINSTALLDIR)/opt
@install-gdb-printers -L
else
- @ooinstall -l $(OUTDIR)/installation/opt
+ @ooinstall -l $(DEVINSTALLDIR)/opt
endif
- @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/
$(SRCDIR)/install
+ @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/
$(SRCDIR)/install
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
diff --git a/config_host.mk.in b/config_host.mk.in
index 0357ffb..9a6b09c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -76,6 +76,7 @@ export DB_LIB=@DB_LIB@
export debug=@ENABLE_DEBUG@
export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
+export DEVINSTALLDIR=@DEVINSTALLDIR@
export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
diff --git a/configure.in b/configure.in
index eb300c9..d8a1611 100644
--- a/configure.in
+++ b/configure.in
@@ -11135,6 +11135,11 @@ INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
AC_MSG_RESULT([$INSTALLDIR])
AC_SUBST(INSTALLDIR)
+AC_MSG_CHECKING([for dev-install dir])
+DEVINSTALLDIR="$OUTDIR/installation"
+AC_MSG_RESULT([$DEVINSTALLDIR])
+AC_SUBST(DEVINSTALLDIR)
+
# ===
# De- or increase default verbosity of build process
# ===
diff --git a/smoketest/CppunitTest_smoketest.mk
b/smoketest/CppunitTest_smoketest.mk
index cbfc3d3..71a7bce 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -39,9 +39,9 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
))
ifeq ($(OS),MACOSX)
-my_soffice:=path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice
+my_soffice:=path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
else
-my_soffice:=path:$(OUTDIR)/installation/opt/program/soffice
+my_soffice:=path:$(DEVINSTALLDIR)/opt/program/soffice
endif
$(eval $(call gb_CppunitTest_use_ure,smoketest))
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index df327a0..c478929 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -27,7 +27,7 @@
GDBDIR="${SOLARENV}/gdb"
SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
-INSTALLDIR="${SOLARVER}/${INPATH}/installation/opt"
+INSTALLDIR="${DEVINSTALLDIR}/opt"
DYLIB=so
if [ "$(uname)" = Darwin ]; then
INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 15237eb..4d55916 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -171,7 +171,7 @@ debugrun :
dev-install :
@rm -f $(SRCDIR)/install && \
- ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
+ ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
$(info $(gb_Module_DEVINSTALLHINT))
define gb_Module_Module
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 819fbef..6e4a741 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -388,7 +388,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice}"
\
-Dorg.openoffice.test.arg.env=DYLD_LI
