[Libreoffice-commits] core.git: windows/README
windows/README |3 +++ 1 file changed, 3 insertions(+) New commits: commit 09bea7e0ee55caa2060b5de294238a0802bae99f Author: Tor Lillqvist Date: Sun Mar 13 09:06:20 2016 +0200 Add a README to avoid unrealistic expectations Change-Id: If9b2f7e660457dd123e991f45f05e1b1cb4d3528 diff --git a/windows/README b/windows/README new file mode 100644 index 000..3287a74 --- /dev/null +++ b/windows/README @@ -0,0 +1,3 @@ +This is not supposed to work the way you might think. You can not +build LibreOffice using this solution (or project), and you can not +see all the source code using it. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build error
> 2) Opening visual Studio solution does nothing. > Which solution do you mean? The one in the 'windows' subdirectory? That is not supposed to do anything interesting. It is mostly a dummy project whose only purpose is to enable *starting* an already built LibreOffice in the Visual Studio debugger. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2016-13-03_02:24:08 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'distro/cib/libreoffice-5-1'
New branch 'distro/cib/libreoffice-5-1' available with the following commits: commit 9a0cc6393fe859f9c8a15b727590738c104c1059 Author: Katarina Behrens Date: Wed Feb 10 14:42:18 2016 +0100 Branded images for msi installer The sizes are 122 x 234, 374 x 44 installed units respectively, according to http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still looks pixelated, but it's as good as it gets. For better results, we need different graphics, with less fine details given the very limited space Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b commit 65f75c0b35eadc8b1988c97942d71d5fda66ff48 Author: Katarina Behrens Date: Tue Feb 9 11:09:30 2016 +0100 Branded application icons sadly, this doesn't replace Windows taskbar icon, that must be living somewhere else. It works on Linux though. Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b commit 2b67c8763a5ba2406c4aac79c02b31af172dfc47 Author: Katarina Behrens Date: Tue Feb 9 10:38:29 2016 +0100 Point to CIB helpdesk it's pretty mean, b/c German translation (which I can't change) says the site is in English, while CIB site is in German only and can't be switched to other lang Change-Id: Ifbbb9e9d2bbee40998c07d1c68b61cd20d77dbc3 commit 4aa88af98d85ef9fa88e04f48c6c3c99916be29b Author: Katarina Behrens Date: Tue Feb 9 10:00:30 2016 +0100 Point to CIB website this idiotic postprocess script hard-codes libreoffice.org for some reason, grr Change-Id: Ide1f19d4da9a437e01118e8baf74c0d1a8ca2e10 commit cdb41b6185d128581586ef38fd9c68196629517e Author: Katarina Behrens Date: Mon Sep 21 13:47:57 2015 +0200 CIB branding for start center Change-Id: I9887fded72131c7888d6e1b1165a778c8da2952d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'distro/cib/libreoffice-5-0'
New branch 'distro/cib/libreoffice-5-0' available with the following commits: commit 24cb36d29585376ef28fb69647be70946b2d585a Author: Katarina Behrens Date: Wed Feb 10 14:42:18 2016 +0100 Branded images for msi installer The sizes are 122 x 234, 374 x 44 installed units respectively, according to http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still looks pixelated, but it's as good as it gets. For better results, we need different graphics, with less fine details given the very limited space Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b commit d0206cb4ac2db20011626a0fb26619b5df935111 Author: Katarina Behrens Date: Tue Feb 9 11:09:30 2016 +0100 Branded application icons sadly, this doesn't replace Windows taskbar icon, that must be living somewhere else. It works on Linux though. Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b commit cea2336c3a766fe8a9de2805189e4683c50a80d2 Author: Katarina Behrens Date: Tue Feb 9 10:38:29 2016 +0100 Point to CIB helpdesk it's pretty mean, b/c German translation (which I can't change) says the site is in English, while CIB site is in German only and can't be switched to other lang Change-Id: Ifbbb9e9d2bbee40998c07d1c68b61cd20d77dbc3 commit 400f46b0dc06d57e1c453e17494c0c856d3b07c9 Author: Katarina Behrens Date: Tue Feb 9 10:00:30 2016 +0100 Point to CIB website this idiotic postprocess script hard-codes libreoffice.org for some reason, grr Change-Id: Ide1f19d4da9a437e01118e8baf74c0d1a8ca2e10 commit fac8ff0eb70f7113aa30a0b2116e8f91e606115d Author: Katarina Behrens Date: Mon Sep 21 13:47:57 2015 +0200 CIB branding for start center Change-Id: I9887fded72131c7888d6e1b1165a778c8da2952d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Proposal for using std::unique_ptr to signal transfer of ownership
Markus Mohrhard wrote: > I hope that these are not really controversial [...] > Not at all - to state the obvious (and not let the mail linger unanswered). Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/graph.hxx |3 ++-
vcl/inc/impgraph.hxx|7 +++
vcl/source/filter/graphicfilter.cxx | 30 +++---
vcl/source/gdi/graph.cxx| 10 ++
vcl/source/gdi/impgraph.cxx | 24 +++-
5 files changed, 45 insertions(+), 29 deletions(-)
New commits:
commit 02de3a5206c7633d62ebc43edad37747e2c7a1de
Author: Norbert Thiebaud
Date: Sat Mar 12 14:13:35 2016 -0600
vcl graph: stop abusing a pointer for a bool
Change-Id: I816fe3a52c03fa5a3fd372492985783f9f6ff91c
Reviewed-on: https://gerrit.libreoffice.org/23181
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 7514f87..0c10149 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -198,7 +198,8 @@ public:
GraphicReader* GetContext();
voidSetContext( GraphicReader* pReader );
-
+voidSetDummyContext(bool value);
+boolIsDummyContext();
private:
friend class GraphicObject;
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 2eac350..5f26354 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -49,7 +49,7 @@ private:
sal_uLong mnRefCount;
boolmbSwapOut;
boolmbSwapUnderway;
-
+boolmbDummyContext;
SvgDataPtr maSvgData;
private:
@@ -115,8 +115,7 @@ private:
GraphicReader* ImplGetContext() { return mpContext;}
voidImplSetContext( GraphicReader* pReader );
-
-private:
+voidImplSetDummyContext( bool value ) { mbDummyContext =
value; }
boolImplReadEmbedded( SvStream& rIStream );
boolImplWriteEmbedded( SvStream& rOStream );
@@ -128,7 +127,7 @@ private:
boolImplSwapOut( SvStream* pOStm );
boolImplIsSwapOut() const { return mbSwapOut;}
-
+boolImplIsDummyContext() const { return mbDummyContext; }
voidImplSetLink( const GfxLink& );
GfxLink ImplGetLink();
boolImplIsLink() const;
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 5720ef9..5f7ddcc 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1326,7 +1326,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic&
rGraphic, const OUString& rPat
sal_uInt16 nStatus;
GraphicReader* pContext = rGraphic.GetContext();
GfxLinkType eLinkType = GFX_LINK_TYPE_NONE;
-boolbDummyContext = ( pContext ==
reinterpret_cast(1) );
+boolbDummyContext = rGraphic.IsDummyContext();
const bool bLinkSet = rGraphic.IsLink();
FilterConfigItem* pFilterConfigItem = nullptr;
@@ -1376,7 +1376,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic&
rGraphic, const OUString& rPat
{
if( bDummyContext )
{
-rGraphic.SetContext( nullptr );
+rGraphic.SetDummyContext( false );
nStreamBegin = 0;
}
else
@@ -1387,7 +1387,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic&
rGraphic, const OUString& rPat
// if pending, return GRFILTER_OK in order to request more bytes
if( rIStream.GetError() == ERRCODE_IO_PENDING )
{
-rGraphic.SetContext( reinterpret_cast(1) );
+rGraphic.SetDummyContext(true);
rIStream.ResetError();
rIStream.Seek( nStreamBegin );
return (sal_uInt16) ImplSetError( GRFILTER_OK );
@@ -1418,8 +1418,8 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic&
rGraphic, const OUString& rPat
{
if( aFilterName.equalsIgnoreAsciiCase( IMP_GIF ) )
{
-if( rGraphic.GetContext() == reinterpret_cast(1) )
-rGraphic.SetContext( nullptr );
+if( rGraphic.IsDummyContext())
+rGraphic.SetDummyContext( false );
if( !ImportGIF( rIStream, rGraphic ) )
nStatus = GRFILTER_FILTERERROR;
@@ -1428,8 +1428,8 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic&
rGraphic, const OUString& rPat
}
else if( aFilterName.equalsIgnoreAsciiCase( IMP_PNG ) )
{
-if ( rGraphic.GetContext() == reinterpret_cast(1) )
-rGraphic.SetContext( nullptr );
+if( rGraphic.IsDummyContext())
+rGraphic.SetDummyContext( false );
vcl::PNGReader aPNGReader( rIStream );
@@ -1486,8 +1486,8 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic&
rGraphic, const OUString& rPat
}
else if( aFilterName.equalsIgnoreAsciiCase( IMP_JPEG ) )
{
-if( rGraphic.GetContext
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - starmath/source
starmath/source/dialog.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 46dac6598b066a43db851a5764778cfa1207e97d Author: Takeshi Abe Date: Fri Mar 11 19:50:59 2016 +0900 Resolves tdf#88485: Allow to select rightmost symbols in the dialog by adjusting target area with proper offsets. Change-Id: I66100c898354909623991c3af3e78287d6f5a9a0 Reviewed-on: https://gerrit.libreoffice.org/23147 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit e7e1d50fc0c8077be9d9603eab8ef86098c9aa24) Reviewed-on: https://gerrit.libreoffice.org/23158 diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index e043179..6a97fba 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1185,6 +1185,8 @@ void SmShowSymbolSetWindow::MouseButtonDown(const MouseEvent& rMEvt) GrabFocus(); Size aOutputSize(nColumns * nLen, nRows * nLen); +aOutputSize.Width() += nXOffset; +aOutputSize.Height() += nYOffset; Point aPoint(rMEvt.GetPosPixel()); aPoint.X() -= nXOffset; aPoint.Y() -= nYOffset; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: rsc/source
rsc/source/parser/rscdb.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bc573d62203d6001fac95d93107cd181882b5cf2
Author: Caolán McNamara
Date: Sat Mar 12 21:10:05 2016 +
WaE: loplugin:stringconcat
Change-Id: I28a106e978cdfd70847737784f9bff6ae365fda7
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index dbf0a54..7f135be 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -96,8 +96,8 @@ OString RscTypCont::ChangeLanguage(const OString& rNewLang)
AddLanguage( aLang.getStr() );
nID = GetLangId( aLang );
}
-SAL_INFO("rsc", "RscTypCont::ChangeLanguage: " <<
-"'" << aLang << "'" << " (0x" << std::hex << nID << ") (" << (bAdd
? "added" : "exists"));
+SAL_INFO("rsc", "RscTypCont::ChangeLanguage: '" <<
+aLang << "' (0x" << std::hex << nID << ") (" << (bAdd ? "added" :
"exists"));
aLangFallbacks.push_back( nID);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtksalmenu.hxx |2 -
vcl/unx/gtk/gtksalmenu.cxx | 50 ++---
2 files changed, 43 insertions(+), 9 deletions(-)
New commits:
commit e22618a355c0e506b8cfac9c52e9564db26949d2
Author: Caolán McNamara
Date: Sat Mar 12 21:03:04 2016 +
Resolves: tdf#92067 with duplicate menu entries track which to activate
rather than just stick 2/3/4 at the end embed that this is a dup as the
prefix and strip that off at dispatch time and pass the dup index around
as a counter to how many dup candidates to dismiss to find the desired
one.
Change-Id: I81d97090a7e9b8c2995a3b27934f3ee5636d05fe
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 51cb451..8dadcfe 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -54,7 +54,7 @@ private:
GMenuModel* mpMenuModel;
GActionGroup* mpActionGroup;
-GtkSalMenu* GetMenuForItemCommand( gchar* aCommand,
gboolean bGetSubmenu );
+GtkSalMenu* GetMenuForItemCommand( gchar* aCommand, int&
rDupsToSkip, gboolean bGetSubmenu );
voidImplUpdate(bool bRecurse, bool
bRemoveDisabledEntries);
voidActivateAllSubmenus(Menu* pMenuBar);
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 722d242..91b7f35 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -62,14 +62,14 @@ static gchar* GetCommandForItem( GtkSalMenuItem*
pSalMenuItem, gchar* aCurrentCo
aCommand = g_strdup( aCommandStr );
// Some items could have duplicated commands. A new one should be
generated.
-for ( sal_uInt16 i = 2; ; i++ )
+for ( sal_uInt16 i = 1; ; i++ )
{
if ( !g_action_group_has_action( pActionGroup, aCommand )
|| ( aCurrentCommand && g_strcmp0( aCurrentCommand,
aCommand ) == 0 ) )
break;
g_free( aCommand );
-aCommand = g_strdup_printf("%s%d", aCommandStr, i);
+aCommand = g_strdup_printf("dup:%d:%s", i, aCommandStr);
}
g_free( aCommandStr );
@@ -867,7 +867,7 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
g_variant_unref(pTarget);
}
-GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean
bGetSubmenu )
+GtkSalMenu* GtkSalMenu::GetMenuForItemCommand(gchar* aCommand, int&
rDupsToSkip, gboolean bGetSubmenu)
{
SolarMutexGuard aGuard;
GtkSalMenu* pMenu = nullptr;
@@ -882,7 +882,13 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar*
aCommand, gboolean bGetSub
OString aItemCommandOStr = OUStringToOString( aItemCommand,
RTL_TEXTENCODING_UTF8 );
gchar* aItemCommandStr = const_cast(aItemCommandOStr.getStr());
-if ( g_strcmp0( aItemCommandStr, aCommand ) == 0 )
+bool bFound = g_strcmp0( aItemCommandStr, aCommand ) == 0;
+if (bFound && rDupsToSkip)
+{
+--rDupsToSkip;
+bFound = false;
+}
+if (bFound)
{
pMenu = bGetSubmenu ? pSalItem->mpSubMenu : this;
break;
@@ -890,7 +896,7 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar*
aCommand, gboolean bGetSub
else
{
if ( pSalItem->mpSubMenu != nullptr )
-pMenu = pSalItem->mpSubMenu->GetMenuForItemCommand( aCommand,
bGetSubmenu );
+pMenu = pSalItem->mpSubMenu->GetMenuForItemCommand(aCommand,
rDupsToSkip, bGetSubmenu);
if ( pMenu != nullptr )
break;
@@ -900,10 +906,32 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar*
aCommand, gboolean bGetSub
return pMenu;
}
+namespace
+{
+const gchar* DetermineDupIndex(const gchar *aCommand, int& rDupsToSkip)
+{
+if (g_str_has_prefix(aCommand, "dup:"))
+{
+aCommand = aCommand + strlen("dup:");
+gchar *endptr;
+rDupsToSkip = g_ascii_strtoll(aCommand, &endptr, 10);
+aCommand = endptr+1;
+}
+else
+rDupsToSkip = 0;
+
+return aCommand;
+}
+}
+
void GtkSalMenu::DispatchCommand( gint itemId, const gchar *aCommand )
{
SolarMutexGuard aGuard;
-GtkSalMenu* pSalSubMenu = GetMenuForItemCommand(
const_cast(aCommand), FALSE );
+
+int nDupsToSkip;
+aCommand = DetermineDupIndex(aCommand, nDupsToSkip);
+
+GtkSalMenu* pSalSubMenu =
GetMenuForItemCommand(const_cast(aCommand), nDupsToSkip, FALSE);
Menu* pSubMenu = ( pSalSubMenu != nullptr ) ? pSalSubMenu->GetMenu() :
nullptr;
mpVCLMenu->HandleMenuCommandEvent(pSubMenu, itemId);
}
@@ -930,7 +958,10 @@ void GtkSalMenu::Activate( const gchar* aMenuCommand )
return;
}
-GtkSalMenu* pSalSubMenu = GetMenuForItemCommand(
const_cast(aMenuCommand), TRUE );
+int nD
[Libreoffice-commits] core.git: download.lst external/liborcus
download.lst |4
external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch | 1175
--
external/liborcus/0001-Get-it-to-build-on-Windows.patch | 212 -
external/liborcus/UnpackedTarball_liborcus.mk |2
4 files changed, 2 insertions(+), 1391 deletions(-)
New commits:
commit 0cead356b8bc8983a0bd45a661b299dec8f64330
Author: Kohei Yoshida
Date: Sat Mar 12 12:48:09 2016 -0500
Update liborcus to 0.11.1.
This is mostly a build-fix release, to absorb patches previously applied
locally.
Change-Id: I1d1808c3ca27f04f89f4df6c0b40a646ca07d242
Reviewed-on: https://gerrit.libreoffice.org/23180
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
diff --git a/download.lst b/download.lst
index 7072a3a..957451f 100644
--- a/download.lst
+++ b/download.lst
@@ -117,8 +117,8 @@ export OPENCOLLADA_TARBALL :=
OpenCOLLADA-master-6509aa13af.tar.bz2
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
export OPENSSL_MD5SUM := f3c710c045cdee5fd114feb69feba7aa
export OPENSSL_TARBALL := openssl-1.0.2g.tar.gz
-export ORCUS_MD5SUM := ca1e5d486b29cd519bb1d9845a6a768e
-export ORCUS_TARBALL := liborcus-0.11.0.tar.gz
+export ORCUS_MD5SUM := 2bff8a3683caa70a438d5cdfda4cfb4f
+export ORCUS_TARBALL := liborcus-0.11.1.tar.gz
export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
export OWNCLOUD_ANDROID_LIB_TARBALL :=
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c
diff --git a/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
b/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
deleted file mode 100644
index d03c98d..000
--- a/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
+++ /dev/null
@@ -1,1175 +0,0 @@
-From a1df2d984d527931c6cbbe6547856283bdbf6a9b Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida
-Date: Sun, 6 Mar 2016 21:21:31 -0500
-Subject: [PATCH] Fix for OSX build inside LibreOffice.
-
- include/orcus/sax_ns_parser.hpp | 2 +-
- slickedit/orcus.vpj | 178 ---
- src/liborcus/dom_tree.cpp| 12 +--
- src/liborcus/json_document_tree.cpp | 29 +++--
- src/liborcus/json_document_tree_test.cpp | 2 +-
- src/liborcus/ods_content_xml_context.cpp | 2 +-
- src/liborcus/opc_reader.cpp | 2 +-
- src/liborcus/orcus_gnumeric.cpp | 2 +-
- src/liborcus/orcus_import_ods.cpp| 2 +-
- src/liborcus/orcus_import_xlsx.cpp | 2 +-
- src/liborcus/orcus_xls_xml.cpp | 2 +-
- src/liborcus/orcus_xlsx.cpp | 20 ++--
- src/liborcus/orcus_xml.cpp | 4 +-
- src/liborcus/xlsx_sheet_context.cpp | 8 +-
- src/liborcus/xml_map_tree.cpp| 6 +-
- src/liborcus/xml_structure_tree.cpp | 4 +-
- src/liborcus/yaml_document_tree.cpp | 34 +++---
- src/mso/encryption_info.cpp | 3 +-
- src/orcus_filter_global.cpp | 2 +-
- src/orcus_json_main.cpp | 2 +-
- src/orcus_yaml_main.cpp | 2 +-
- src/parser/json_parser_base.cpp | 2 +-
- src/parser/sax_parser_base.cpp | 2 +-
- src/parser/string_pool.cpp | 4 +-
- src/parser/yaml_parser_base.cpp | 2 +-
- src/spreadsheet/document.cpp | 2 +-
- 26 files changed, 95 insertions(+), 237 deletions(-)
-
-diff --git a/include/orcus/sax_ns_parser.hpp b/include/orcus/sax_ns_parser.hpp
-index 680f39d..49a2b48 100644
a/include/orcus/sax_ns_parser.hpp
-+++ b/include/orcus/sax_ns_parser.hpp
-@@ -142,7 +142,7 @@ private:
-
- void start_element(const sax::parser_element& elem)
- {
--m_scopes.push_back(make_unique<__sax::elem_scope>());
-+m_scopes.push_back(orcus::make_unique<__sax::elem_scope>());
- __sax::elem_scope& scope = *m_scopes.back();
- scope.ns = m_ns_cxt.get(elem.ns);
- scope.name = elem.name;
-diff --git a/slickedit/orcus.vpj b/slickedit/orcus.vpj
-index 23c6d42..bbc89ec 100644
a/slickedit/orcus.vpj
-+++ b/slickedit/orcus.vpj
-@@ -145,6 +145,10 @@
- Filters="">
-
-
-+
-+
-+
-+
-
-
-
-@@ -186,6 +190,7 @@
-
-
-
-+
-
-
-
-@@ -193,43 +198,34 @@
-
-
-
--
--
-
-
--
--
-
-
--
--
-
-
--
-
--
--
-
-
[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp
loolwsd/ChildProcessSession.cpp |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2c3739bdc287c05e174d3be988b5c84da24bf5cf
Author: Pranav Kant
Date: Sat Mar 12 22:47:34 2016 +0530
loolwsd: Fix a memory leak
Change-Id: I9a48c2846f74cb7cee8430dd4e72ba0580a7e7f2
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 468eaa3..38d8ba9 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -947,6 +947,8 @@ bool ChildProcessSession::getTextSelection(const char*
/*buffer*/, int /*length*
char *textSelection =
_loKitDocument->pClass->getTextSelection(_loKitDocument, mimeType.c_str(),
nullptr);
sendTextFrame("textselectioncontent: " + std::string(textSelection));
+
+free(textSelection);
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build error
I'm sorry. Actually I was talking about partial build that VS does. Problem with using LODE is that it doesn't support source as tarball. It clones the repository again. I don't have very good internet here. And I did the build via regular make in cygwin. Should I run and autogen.sh and then 'make' again on fresh copy of source? On Mar 12, 2016 11:51 PM, "jan iversen" wrote: > > On 12 Mar 2016, at 16:51, Mayank Gupta wrote: > > After changing the cygwin interface to source directory I ran: > /opt/lo/bin/make vs2013-ide-integration > As stated by the instructions on wiki 'BuildingOnWindows' document. > PS: I've set up all the directories according to the instructions only and > not my own to avoid any confusion for myself and for others to whom I ask > my doubts. > > Today we recommend using: > https://wiki.documentfoundation.org/Development/GetInvolved > > That uses the lode development. > > The vs2013-ide-integration does not allow you to build LO. We have a GSoC > project upcoming to remedy that. > > rgds > jan i. > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build error
> On 12 Mar 2016, at 16:51, Mayank Gupta wrote: > > After changing the cygwin interface to source directory I ran: > /opt/lo/bin/make vs2013-ide-integration > As stated by the instructions on wiki 'BuildingOnWindows' document. > PS: I've set up all the directories according to the instructions only and > not my own to avoid any confusion for myself and for others to whom I ask my > doubts. > Today we recommend using: https://wiki.documentfoundation.org/Development/GetInvolved That uses the lode development. The vs2013-ide-integration does not allow you to build LO. We have a GSoC project upcoming to remedy that. rgds jan i. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Lode and Chocolate.
On Sat, Mar 12, 2016 at 3:06 AM, jan iversen wrote: > > >> On 12 Mar 2016, at 09:52, Norbert Thiebaud wrote: >> >> On Sat, Mar 12, 2016 at 2:10 AM, jan iversen >> wrote: >>> Hi. >>> >>> Just tried the new chocolate setup with lode, works very nicely. GOOD WORK. >>> >>> It would be even nice if we got it integrated into the first lode install >>> script, or at least the script check for the prerequsites. >> >> lode is meant to be run as a non-admin, on purpose so that the cygwin >> installed is owned by the normal user.. which save the back and forth >> to install new packages or edit /etc or usr/ >> and in general it is a good thing to build with a regular user (just >> like on linux you should not build as root) >> >> chocolate, and the stuff it install need to be as 'admin' >> so that still would require two step... >> Still that can make things much nicer.. since lode could provide a >> chocolate wrapper that the user be instructed to run as admin >> > Interesting, when I read the instructions, I read that install_cygwin.ps1 is > run as admin no it does not say that.. it even says: "Note: The install is done with your own user account, without Administrator escalation. This means that there will be no Cygwin entries in the Start Menu and no shortcut on the Desktop." teh big fat warning should be higher. with: unless explicitely told otherwise, run as normal user not Admin or root. > > My thinking was to have the chocolate steps in install_cygwin.ps1 with our > "defaults" and command line options to overwrite them. No. for multiple reason 1/ chocolate need Admin, install_cygwin does not 2/ user are likely to already have a VS installed... but not necessarily cygwin. so I would just make available 2 ps1 script... one to be run as admin that do the chocolaty thing and the exisitng install_cygwin one (to be run as regular user) we can also 'steal' the bootstrapping sequence of chocolate to bypass the script restrinction when you are admin (that would work for that part since it has to be run as admin.. but not for cygwin_install which should run as Normal user Note: I'm not very fond of the chocolaty bootstrap, which essentially download a script from the internet and run it as admin.. without the user gettign a chance to inspect it that is scary to me... your' mileage may vary.. but _I_ would fetch the script. look at it and _then_ maybe run it :-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
memory leaks around Application::PostUserEvent
Hey, so while looking through the calc memory leaks I have many leaks related to the return object of Application::PostUserEvent. The returned value is created with new but I see no clear ownership for the returned value. Does anyone known who should actually own that object? It seems to be passed around a lot and there is the RemoveUserEvent function but I did not see any code that actually deletes the object. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/charmap.cxx |2 -- svx/source/fmcomp/gridcell.cxx |1 - svx/source/items/chrtitem.cxx |1 - svx/source/xml/xmleohlp.cxx|1 - svx/source/xoutdev/xattr.cxx |1 - 5 files changed, 6 deletions(-) New commits: commit 6c1428121189bc233f4bb8a97bd96c75dd942fa0 Author: Julien Nabet Date: Sat Mar 12 13:48:59 2016 +0100 Remove some unused include stdio (svx) Change-Id: Ide50d9dc67b9383bd7c0f4e710ea04e5d6892b02 Reviewed-on: https://gerrit.libreoffice.org/23175 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 6855141..7e31fd5 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include - #include #include #include diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 20ea063..4288321 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -68,7 +68,6 @@ #include #include -#include using namespace ::connectivity; using namespace ::svxform; diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 429e283..7dd679c 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include "svx/chrtitem.hxx" diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index dfd84e3..6898ebb 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -18,7 +18,6 @@ */ -#include #include #include #include diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 73e2c41b4..486a3f6 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -53,7 +53,6 @@ #include #include -#include #include using namespace ::com::sun::star; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - leak-suppress.txt sc/qa sc/source
leak-suppress.txt|4
sc/qa/unit/bugfix-test.cxx |2 +-
sc/qa/unit/copy_paste_test.cxx |2 +-
sc/source/core/data/dptabres.cxx |3 ++-
sc/source/filter/excel/xecontent.cxx |8 +---
sc/source/filter/inc/XclExpChangeTrack.hxx |4 ++--
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 11 +--
7 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit 602f4c8a6133d337853edf47750044a77ef6247d
Author: Markus Mohrhard
Date: Sat Mar 12 17:08:09 2016 +0100
fix memory leak in copy_paste test
Change-Id: If16f6c0cb4d2bd2ae820b62fc7d563df09b27bbb
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 44a24d6..575fbae 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -118,7 +118,7 @@ void ScCopyPasteTest::testCopyPasteXLS()
// 6. Paste
pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL,
&aClipDoc);
-xDocSh->DoClose();
+xComponent->dispose();
}
ScCopyPasteTest::ScCopyPasteTest()
commit 22ea08bdb5d64636cf76a58d6b34be01f5f50791
Author: Markus Mohrhard
Date: Sat Mar 12 17:07:46 2016 +0100
fix memory leak in cond format export
Change-Id: I3c0379dfa972cb552382153f3d363eaf3bfe604d
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 71a3809..f8162b4 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -945,14 +945,16 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
{
rWorksheet->startElement( XML_formula, FSEND );
+std::unique_ptr
pTokenArray(mrFormatEntry.CreateTokenArry(0));
rWorksheet->writeEscaped(XclXmlUtils::ToOUString(
GetCompileFormulaContext(), mrFormatEntry.GetValidSrcPos(),
-mrFormatEntry.CreateTokenArry(0)));
+pTokenArray.get()));
rWorksheet->endElement( XML_formula );
if (bFmla2)
{
rWorksheet->startElement( XML_formula, FSEND );
+std::unique_ptr
pTokenArray2(mrFormatEntry.CreateTokenArry(1));
rWorksheet->writeEscaped(XclXmlUtils::ToOUString(
GetCompileFormulaContext(), mrFormatEntry.GetValidSrcPos(),
-mrFormatEntry.CreateTokenArry(1)));
+pTokenArray2.get()));
rWorksheet->endElement( XML_formula );
}
}
@@ -1091,7 +1093,7 @@ void XclExpCfvo::SaveXml( XclExpXmlStream& rStrm )
if(mrEntry.GetType() == COLORSCALE_FORMULA)
{
OUString aFormula = XclXmlUtils::ToOUString(
GetCompileFormulaContext(), maSrcPos,
-mrEntry.GetFormula()->Clone());
+mrEntry.GetFormula());
aValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 );
}
else
commit 867bf5b48eeae3925de2196d38554518938f9c1a
Author: Markus Mohrhard
Date: Sat Mar 12 16:49:29 2016 +0100
fix memory leak in change tracking export
Change-Id: Idffa7c4a9c9519c150458db3749e7b67fbbb463c
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 2818210..928d45f 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -251,7 +251,7 @@ class XclExpXmlChTrHeader : public ExcXmlRecord
sal_uInt32 mnMaxAction;
std::vector maTabBuffer;
-std::vector maActions;
+std::vector> maActions;
public:
XclExpXmlChTrHeader(
@@ -260,7 +260,7 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) override;
-void AppendAction( XclExpChTrAction* pAction );
+void AppendAction( std::unique_ptr pAction );
};
// XclExpChTrInfo - header of action group of a user
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 9e9ccc2..2d2e675 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -476,11 +476,10 @@ void XclExpXmlChTrHeader::SaveXml( XclExpXmlStream& rStrm
)
pRevLogStrm->write(">");
-std::vector::iterator it = maActions.begin(), itEnd =
maActions.end();
+auto it = maActions.begin(), itEnd = maActions.end();
for (; it != itEnd; ++it)
{
-XclExpChTrAction* p = *it;
-p->SaveXml(rStrm);
+(*it)->SaveXml(rStrm);
}
pRevLogStrm->write("writeId(XML_revisions)->write(">");
@@ -490,7 +489,7 @@ void XclExpXmlChTrHeader::SaveXml( XclExpXmlStream& rStrm )
pHeader->write("writeId(XML_header)->write(">");
}
-void XclExpXmlChTrHeader::AppendAction( XclExpChTrAction* pAction )
+void XclExpXmlChTrHeader::AppendAction( std::unique_ptr
pAction )
{
sal_uInt32 nActionNum = pAction->GetActionNumber();
if (!mnMinAction || mnMinAction > nActionNum)
@@ -
Re: Build error
After changing the cygwin interface to source directory I ran: /opt/lo/bin/make vs2013-ide-integration As stated by the instructions on wiki 'BuildingOnWindows' document. PS: I've set up all the directories according to the instructions only and not my own to avoid any confusion for myself and for others to whom I ask my doubts. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build error
> On 12 Mar 2016, at 10:16, Mayank Gupta wrote: > > Hi all, > I'm Mayank Gupta. GSoC 2016 aspirant for Libreoffice project 'Add impress > shape animations that use real physics engine'. I built Libreoffice on > Windows it was successful with errors related to different tests. So, mst_ on > IRC told it might be because ATL hadn't been disabled properly. He told me > how to handle it and so I made a patch and uploaded to Gerrit. When I built > it in visual Studio. Run impress from LO, added animations to a simple text > in impress, an error popped up saying 'bad allocation'. I checked RAM usage > it peaked to 72%(total 4 gigs RAM) with about 750 MB occupied by Libreoffice > just before failure. Then I did a 'make clean' and did 'make' again on > source directory. Building visual Studio solution was successful without > error. My problems are: > 1) when I run Libreoffice from cygwin terminal it shows error: > The application cannot be started. > A General error occurred while accessing your Central configuration. > ( "com.sun.star.configuration.ReadWriteAccess of type > com.sun.star.configuration.XReadWriteAccess ") > This worked on my win 8.1 installation. > 2) Opening visual Studio solution does nothing. > What should I do to solve these problems? > how did you get a visual studio solution ? rgds jan i > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/DataDef.xba |2 +- wizards/source/access2base/DoCmd.xba |2 -- wizards/source/access2base/Field.xba |2 +- 3 files changed, 2 insertions(+), 4 deletions(-) New commits: commit 259fc9f32eb70bd3b07775f2e11524ab75510e1c Author: Jean-Pierre Ledure Date: Sat Mar 12 16:11:03 2016 +0100 Access2Base - Correct error message and other typo's Change-Id: Ia046bcd8ca8e90566348b507f18d881030bd64c3 diff --git a/wizards/source/access2base/DataDef.xba b/wizards/source/access2base/DataDef.xba index a283264..df416c0 100644 --- a/wizards/source/access2base/DataDef.xba +++ b/wizards/source/access2base/DataDef.xba @@ -15,7 +15,7 @@ REM --- CLASS ROOT FIELDS --- REM --- Private_Type As String ' Must be TABLEDEF or QUERYDEF -Private _Name As String +Private _Name As String ' For tables: [[Catalog.]Schema.]Table Private _ParentDatabaseAs Object Private _ReadOnly As Boolean Private Table As Object ' com.sun.star.sdb.dbaccess.ODBTable diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba index 1b6e481..8fe7ec9 100644 --- a/wizards/source/access2base/DoCmd.xba +++ b/wizards/source/access2base/DoCmd.xba @@ -25,8 +25,6 @@ Type _FindParams ResultSetIndex()As Integer ' Array of column numbers in ResultSet End Type -'Global _gFindAs _FindParams - Type _Window Frame As Object ' com.sun.star.comp.framework.Frame _Name As String ' Object Name diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba index cd8b930..7bff09d 100644 --- a/wizards/source/access2base/Field.xba +++ b/wizards/source/access2base/Field.xba @@ -198,7 +198,7 @@ Dim oValue As Object, bNullable As Boolean, bNull As Boolean, vValue() As Varian End If If Not Utils._CheckArgument(pvBytes, 2, _AddNumeric()) Then Goto Exit_Function If pvBytes < 0 Then - TraceError(TRACEFATAL, ERRWRONGARGUMENT, Utils._CalledSub(), 0, , Array(1, pvBytes)) + TraceError(TRACEFATAL, ERRWRONGARGUMENT, Utils._CalledSub(), 0, , Array(2, pvBytes)) Goto Exit_Function End If ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idl/source
idl/source/cmptools/hash.cxx |1 - idl/source/cmptools/lex.cxx |1 - idl/source/objects/basobj.cxx |1 - idl/source/objects/module.cxx |2 -- idl/source/objects/object.cxx |1 - idl/source/objects/slot.cxx |1 - idl/source/objects/types.cxx |1 - 7 files changed, 8 deletions(-) New commits: commit 33b2d58895a57319364fef540051b1ef544fc954 Author: Julien Nabet Date: Sat Mar 12 13:29:03 2016 +0100 Remove some unused include stdio Change-Id: Ifdb9d133237eecd3132dffb0f85c005beac169d2 Reviewed-on: https://gerrit.libreoffice.org/23174 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index 936c16f..22faf38 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -20,7 +20,6 @@ // C and C++ includes #include -#include #include // program-sensitive includes diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index cb7b2c4..82b3c9e 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 835ae2d..c3a6e0b 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -19,7 +19,6 @@ #include -#include #include diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 11b31cb..197666d 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include -#include #include #include diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 31b6515..d25143f 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 2b2e23c..22702f1 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -19,7 +19,6 @@ #include -#include #include #include #include diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 1317410..d40230a 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -21,7 +21,6 @@ #include #include -#include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source sw/source
dbaccess/source/ui/dlg/ConnectionHelper.cxx |4 ++--
sw/source/ui/dbui/dbui.src |4 ++--
sw/source/uibase/dbui/dbmgr.cxx |8
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit a6ca4ec7f55b94e431dd1d520a03e19fe796c4b6
Author: pasqualm
Date: Sun Mar 6 20:44:01 2016 +0100
tdf#97978: add support for opening mde and accde files in base
This patch modifies the base 'open existing database' wizard so accde and
mde files
can be chosen as targets for access and access 2007 databases. Both file
types are
the runtime-only equivalents to accdb and mdb files so base can use them in
the
same way as does with the former
Change-Id: I5b6002089a2d3c19498ff6e05bae3facc5a4e2d0
Reviewed-on: https://gerrit.libreoffice.org/22957
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index b6afedc0..380e4a3 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -230,7 +230,7 @@ namespace dbaui
break;
case ::dbaccess::DST_MSACCESS:
{
-const OUString sExt("*.mdb");
+const OUString sExt("*.mdb;*.mde");
OUString sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
@@ -242,7 +242,7 @@ namespace dbaui
break;
case ::dbaccess::DST_MSACCESS_2007:
{
-const OUString sAccdb("*.accdb");
+const OUString sAccdb("*.accdb;*.accde");
OUString sFilterName2(ModuleRes
(STR_MSACCESS_2007_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 0124bc7..3962a25 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -78,11 +78,11 @@ String STR_FILTER_CSV
};
String STR_FILTER_MDB
{
-Text [ en-US ] = "Microsoft Access (*.mdb)" ;
+Text [ en-US ] = "Microsoft Access (*.mdb;*.mde)" ;
};
String STR_FILTER_ACCDB
{
-Text [ en-US ] = "Microsoft Access 2007 (*.accdb)" ;
+Text [ en-US ] = "Microsoft Access 2007 (*.accdb,*.accde)" ;
};
String ST_SAVESTART
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 02a33ec..06f9b1f 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2634,8 +2634,8 @@ OUString
SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
xFltMgr->appendFilter( sFilterTXT, "*.txt" );
xFltMgr->appendFilter( sFilterCSV, "*.csv" );
#ifdef _WIN32
-xFltMgr->appendFilter( sFilterMDB, "*.mdb" );
-xFltMgr->appendFilter( sFilterACCDB, "*.accdb" );
+xFltMgr->appendFilter(sFilterMDB, "*.mdb;*.mde");
+xFltMgr->appendFilter(sFilterACCDB, "*.accdb;*.accde");
#endif
xFltMgr->setCurrentFilter( sFilterAll ) ;
@@ -2698,14 +2698,14 @@ SwDBManager::DBConnURITypes
SwDBManager::GetDBunoURI(const OUString &rURI, uno::
type = DBCONN_FLAT;
}
#ifdef _WIN32
-else if(sExt.equalsIgnoreAsciiCase("mdb"))
+else if (sExt.equalsIgnoreAsciiCase("mdb") ||
sExt.equalsIgnoreAsciiCase("mde"))
{
OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA
SOURCE=");
sDBURL += aURL.PathToFileName();
aURLAny <<= sDBURL;
type = DBCONN_MSJET;
}
-else if(sExt.equalsIgnoreAsciiCase("accdb"))
+else if (sExt.equalsIgnoreAsciiCase("accdb") ||
sExt.equalsIgnoreAsciiCase("accde"))
{
OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA
SOURCE=");
sDBURL += aURL.PathToFileName();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source desktop/unx
desktop/source/app/officeipcthread.cxx | 15 +++--
desktop/source/deployment/registry/dp_registry.cxx |2 -
desktop/source/splash/unxsplash.cxx| 21 +++--
desktop/unx/source/start.c | 33 +++--
4 files changed, 19 insertions(+), 52 deletions(-)
New commits:
commit 221144f9c995fe30adf577c02f756b3123fb2550
Author: Rohan Kumar
Date: Wed Mar 9 02:16:47 2016 +0530
tdf#91794 OSL_DEBUG_LEVEL > 1 removed (desktop)
[UPDATED PATCH]: I removed the trailing newline characters in the
SAL_WARN macro as pointed by Jan Iverson
Change-Id: If90b0d44777ec2ab1bd646f22f4c9cdf798cf8b4
Reviewed-on: https://gerrit.libreoffice.org/22315
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 6bf4dc5..e9ad39b 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -249,10 +249,7 @@ rtl::Reference< OfficeIPCThread >
OfficeIPCThread::pGlobalOfficeIPCThread;
// Into a hex string of well known length ff132a86...
OUString CreateMD5FromString( const OUString& aMsg )
{
-#if (OSL_DEBUG_LEVEL > 2)
-fprintf( stderr, "create md5 from '%s'\n",
- OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() );
-#endif
+SAL_WARN("desktop.app", "create md5 from '" << aMsg << "'");
rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
if ( handle )
@@ -750,8 +747,8 @@ void OfficeIPCThread::execute()
}
catch ( const CommandLineArgs::Supplier::Exception & )
{
-#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
-fprintf( stderr, "Error in received command line arguments\n"
);
+#if (OSL_DEBUG_LEVEL > 0) || defined DBG_UTIL
+SAL_WARN("desktop.app", "Error in received command line
arguments");
#endif
continue;
}
@@ -955,7 +952,7 @@ void OfficeIPCThread::execute()
PROCESSING_DONE, SAL_N_ELEMENTS(PROCESSING_DONE));
// incl. terminating NUL
if (n != SAL_N_ELEMENTS(PROCESSING_DONE)) {
-SAL_WARN("desktop", "short write: " << n);
+SAL_WARN("desktop" , "short write: " << n);
continue;
}
}
@@ -969,8 +966,8 @@ void OfficeIPCThread::execute()
}
}
-#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
-fprintf( stderr, "Error on accept: %d\n", (int)nError );
+#if (OSL_DEBUG_LEVEL > 0) || defined DBG_UTIL
+SAL_WARN( "desktop.app", "Error on accept: " << (int)nError);
#endif
TimeValue tval;
tval.Seconds = 1;
diff --git a/desktop/source/deployment/registry/dp_registry.cxx
b/desktop/source/deployment/registry/dp_registry.cxx
index 4c07228..6faba93 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -376,7 +376,7 @@ Reference
PackageRegistryImpl::create(
create_folder( nullptr, registryCachePath,
Reference());
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
// dump tables:
{
t_registryset allBackends;
diff --git a/desktop/source/splash/unxsplash.cxx
b/desktop/source/splash/unxsplash.cxx
index c396fc5..4018535 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -36,10 +36,7 @@ namespace desktop
UnxSplashScreen::~UnxSplashScreen()
{
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "UnxSplashScreen::~UnxSplashScreen()\n" );
-#endif
-
+SAL_WARN("desktop.splash", "UnxSplashScreen::~UnxSplashScreen()");
if ( m_pOutFd )
{
fclose( m_pOutFd );
@@ -55,9 +52,7 @@ void SAL_CALL UnxSplashScreen::start( const OUString&
/*aText*/, sal_Int32 /*nRa
void SAL_CALL UnxSplashScreen::end()
throw ( uno::RuntimeException, std::exception )
{
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "UnxSplashScreen::end()\n" );
-#endif
+SAL_WARN("desktop.splash", "UnxSplashScreen::end()");
if( !m_pOutFd )
return;
@@ -68,9 +63,7 @@ void SAL_CALL UnxSplashScreen::end()
void SAL_CALL UnxSplashScreen::reset()
throw ( uno::RuntimeException, std::exception )
{
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "UnxSplashScreen::reset()\n" );
-#endif
+SAL_WARN("desktop.splash", "UNXSplashScreen::reset()");
if( !m_pOutFd )
return;
@@ -108,11 +101,9 @@ UnxSplashScreen::initialize( const css::uno::Sequence<
css::uno::Any>& )
{
int fd = aNum.toInt32();
m_pOutFd = fdopen( fd, "w" );
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "Got argument '--splash-pipe=%d ('%s') (%p)\n",
- fd, OUStringToOString( aNum, RTL_TEXTENCODING_UTF8
).getStr(),
- m_pOutFd );
-#endif
+SAL_WARN("desktop.splash", "Got argument '
[Libreoffice-commits] core.git: cppuhelper/source dbaccess/source sc/source
cppuhelper/source/servicemanager.cxx |2 +-
dbaccess/source/ui/browser/genericcontroller.cxx |2 +-
sc/source/core/data/conditio.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1151fec7a8c3dfcbc364aa941f477004309b1e59
Author: Julien Nabet
Date: Sat Mar 12 13:15:46 2016 +0100
Let's use the iterator return by erase method (final)
Change-Id: I1934b0c2a9ae9fa089d7e9ded4a289908fb2709a
Reviewed-on: https://gerrit.libreoffice.org/23173
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index 2c29bb6..fe761fe 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1776,7 +1776,7 @@ void cppuhelper::ServiceManager::removeRdbFiles(
removeFromImplementationMap(
&data_.singletons, j->second->info->singletons,
j->second);
-data_.namedImplementations.erase(j++);
+j = data_.namedImplementations.erase(j);
} else {
++j;
}
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 1230c17..1f47b9f 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -736,7 +736,7 @@ void OGenericUnoController::removeStatusListener(const
Reference< XStatusListene
)
)
{
-m_arrStatusListener.erase( iterSearch++ );
+iterSearch = m_arrStatusListener.erase(iterSearch);
if (!bRemoveForAll)
// remove the listener only for the given URL, so we can exit
the loop after deletion
break;
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d65355b..b67b04f 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -2269,7 +2269,7 @@ bool ScConditionalFormatList::CheckAllEntries()
if ((*itr)->GetRange().empty())
{
bValid = false;
-m_ConditionalFormats.erase(itr++);
+itr = m_ConditionalFormats.erase(itr);
}
else
++itr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: rsc/source
rsc/source/parser/rscdb.cxx | 11 ++-
rsc/source/prj/gui.cxx |4 +---
rsc/source/rsc/rsc.cxx | 12 +++-
rsc/source/rscpp/cpp.h | 10 +-
rsc/source/rscpp/cpp1.c | 14 +++---
rsc/source/rscpp/cpp2.c |6 +++---
rsc/source/rscpp/cpp3.c | 16
rsc/source/rscpp/cpp4.c | 12 ++--
rsc/source/rscpp/cpp6.c |4 ++--
9 files changed, 37 insertions(+), 52 deletions(-)
New commits:
commit 0c3ff8ca07265304f9ea0a7aca8c83703cff01a1
Author: Rohan Kumar
Date: Mon Mar 7 22:56:00 2016 +0530
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I replaced OSL_DEBUG_LEVEL > 1 with OSL_DEBUG_LEVEL > 0 conditionals
and in some places i used SAL_INFO(..)s
Change-Id: I87e2e4d73be22630dbcce6df2650b924cba9f8ec
Reviewed-on: https://gerrit.libreoffice.org/23005
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 2c253e8..dbf0a54 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -83,9 +83,6 @@ OString RscTypCont::ChangeLanguage(const OString& rNewLang)
if (bAppendEnUsFallback)
aFallbacks.push_back( "en-US");
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "RscTypCont::ChangeLanguage: " );
-#endif
aLangFallbacks.clear();
@@ -99,15 +96,11 @@ OString RscTypCont::ChangeLanguage(const OString& rNewLang)
AddLanguage( aLang.getStr() );
nID = GetLangId( aLang );
}
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, " '%s' (0x%hx) (%s)", aLang.getStr(), (int)nID, (bAdd
? "added" : "exists") );
-#endif
+SAL_INFO("rsc", "RscTypCont::ChangeLanguage: " <<
+"'" << aLang << "'" << " (0x" << std::hex << nID << ") (" << (bAdd
? "added" : "exists"));
aLangFallbacks.push_back( nID);
}
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "\n" );
-#endif
return aRet;
}
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index 3a0f060..f95f469 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.cxx
@@ -42,9 +42,7 @@ static RscVerbosity lcl_determineVerbosity( int argc, char **
argv )
int rsc2_main( int argc, char **argv )
{
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "debugging %s\n", argv[0] );
-#endif
+SAL_WARN("rsc", "debugging " << argv[0]);
ERRTYPE aError;
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 6d663a2..e4e9a83 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -96,9 +96,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError *
pEH )
i = 1;
while( ppStr && i < (aCmdLine.GetCount() -1) )
{
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "CmdLineArg: \"%s\"\n", *ppStr );
-#endif
+SAL_INFO("rsc", "CmdLineArg: \"" << *ppStr << "\"");
if (strcmp(*ppStr, "-isystem") == 0)
{
// ignore "-isystem" and following arg
@@ -775,9 +773,7 @@ bool RscCompiler::GetImageFilePath( const
RscCmdLine::OutputFile& rOutputFile,
bFile = aFS.isRegular();
}
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "Searching image: %s\n", aSysPath.getStr() );
-#endif
+SAL_INFO("rsc", "Searching image: " << aSysPath);
if( bFile )
{
@@ -812,9 +808,7 @@ bool RscCompiler::GetImageFilePath( const
RscCmdLine::OutputFile& rOutputFile,
fprintf( pSysListFile, "%s\n",
rContext.pCmdLine->substitutePaths( aSysPath ).getStr() );
}
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "ImagePath to add: %s\n", rImagePath.getStr()
);
-#endif
+SAL_INFO("rsc", "ImagePath to add: " << rImagePath);
}
++aDirIter;
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index 0114c29..fb7ff4d 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -28,7 +28,7 @@
/* in cpp1.c: file-pointer auf stdout oder file */
extern FILE* pCppOut; /* BP */
#define PUTCHAR( d ) fprintf( pCppOut, "%c", (d) )/* BP */
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
extern FILE* pDefOut; /* ER */
#ifdef EVALDEFS
#define NEVALBUF2048
@@ -228,7 +228,7 @@ extern char*magic[];/* Magic predefined
symbols */
extern FILEINFO* infile;/* Current input file */
extern char work[NWORK + 1];/* #define scratch */
extern char*workp; /* Free space in work */
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
extern int debug; /* Debug level */
/* ER dump & evaluate #define's */
extern int bDumpDefs; /* TRUE if #define's dump req. */
@@ -269,7 +269,7 @@ void InitCpp6( void );
void output( int c );
voi
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/vclxaccessiblecomponent.cxx|2 -
toolkit/source/controls/controlmodelcontainerbase.cxx | 30 --
2 files changed, 1 insertion(+), 31 deletions(-)
New commits:
commit f3d454647ae5f0398ce3b38a71ed525bc16c3722
Author: Rohan Kumar
Date: Fri Mar 11 19:00:31 2016 +0530
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I replaced OSL_DEBUG_LEVEL > 1 conditionals to OSL_DEBUG_LEVEL > 0
as suggested in easy hack
Change-Id: Ie852e95992bb8b0c49f2d01348ed598dfc26a39a
Reviewed-on: https://gerrit.libreoffice.org/23074
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index b7a89fa..c182d56 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -628,7 +628,7 @@ OUString VCLXAccessibleComponent::getAccessibleName( )
throw (uno::RuntimeExcep
if ( GetWindow() )
{
aName = GetWindow()->GetAccessibleName();
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
aName += " (Type = ";
aName +=
OUString::number(static_cast(GetWindow()->GetType()));
aName += ")";
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index be6c1f9..56475ff 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -949,9 +949,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
AllGroups::iterator aCurrentGroup = maGroups.end(); // the group which
we're currently building
sal_Int32 nCurrentGroupStep = -1; // the step which all
controls of the current group belong to
-#if OSL_DEBUG_LEVEL > 1
-::std::vector< OUString > aCurrentGroupLabels;
-#endif
for ( ; pControlModels != pControlModelsEnd; ++pControlModels )
{
@@ -981,13 +978,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
// new state: looking for further members
eState = eExpandingGroup;
-#if OSL_DEBUG_LEVEL > 1
-Reference< XPropertySet > xModelProps( *pControlModels,
UNO_QUERY );
-OUString sLabel;
-if ( xModelProps.is() &&
xModelProps->getPropertySetInfo().is() &&
xModelProps->getPropertySetInfo()->hasPropertyByName("Label") )
-xModelProps->getPropertyValue("Label") >>= sLabel;
-aCurrentGroupLabels.push_back( sLabel );
-#endif
}
break;
@@ -997,9 +987,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
{ // no radio button -> the group is done
aCurrentGroup = maGroups.end();
eState = eLookingForGroup;
-#if OSL_DEBUG_LEVEL > 1
-aCurrentGroupLabels.clear();
-#endif
continue;
}
@@ -1014,22 +1001,12 @@ void
ControlModelContainerBase::implUpdateGroupStructure()
// state still is eExpandingGroup - we're looking for
further elements
eState = eExpandingGroup;
-#if OSL_DEBUG_LEVEL > 1
-Reference< XPropertySet > xModelProps( *pControlModels,
UNO_QUERY );
-OUString sLabel;
-if ( xModelProps.is() &&
xModelProps->getPropertySetInfo().is() &&
xModelProps->getPropertySetInfo()->hasPropertyByName("Label") )
-xModelProps->getPropertyValue("Label") >>= sLabel;
-aCurrentGroupLabels.push_back( sLabel );
-#endif
continue;
}
// it's a radio button, but on a different page
// -> we open a new group for it
-#if OSL_DEBUG_LEVEL > 1
-aCurrentGroupLabels.clear();
-#endif
// open a new group
size_t nGroups = maGroups.size();
@@ -1042,13 +1019,6 @@ void
ControlModelContainerBase::implUpdateGroupStructure()
// state is the same: we still are looking for further
elements of the current group
eState = eExpandingGroup;
-#if OSL_DEBUG_LEVEL > 1
-Reference< XPropertySet > xModelProps( *pControlModels,
UNO_QUERY );
-OUString sLabel;
-if ( xModelProps.is() &&
xModelProps->getPropertySetInfo().is() &&
xModelProps->getPropertySetInfo()->hasPropertyByName("Label") )
-xModelProps->getPropertyValue("Label") >>= sLabel;
-aCurrentGroupLabels.push_back( sLabel );
-#endif
}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/baside2b.cxx |7 --- 1 file changed, 7 deletions(-) New commits: commit eda245925170eab692143deed367ab11a9adb310 Author: Rohan Kumar Date: Fri Mar 11 18:49:08 2016 +0530 tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals I removed the OSL_DEBUG_LEVEL > 1 conditional and replaced it to OSL_DEBUG_LEVEL > 0 as suggested in easy hack. Change-Id: If5f086f280d01e7a80be59f3c992dc2d0a7663cf Reviewed-on: https://gerrit.libreoffice.org/23062 Tested-by: Jenkins Reviewed-by: Björn Michaelsen diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 4b40a42..73354e1 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -497,13 +497,6 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) if ( !pEditView ) // Happens in Win95 return; -#if OSL_DEBUG_LEVEL > 1 -Range aRange = rModulWindow.GetHScrollBar()->GetRange(); (void)aRange; -long nVisSz = rModulWindow.GetHScrollBar()->GetVisibleSize(); (void)nVisSz; -long nPapSz = rModulWindow.GetHScrollBar()->GetPageSize(); (void)nPapSz; -long nLinSz = rModulWindow.GetHScrollBar()->GetLineSize(); (void)nLinSz; -long nThumb = rModulWindow.GetHScrollBar()->GetThumbPos(); (void)nThumb; -#endif bool const bWasModified = pEditEngine->IsModified(); // see if there is an accelerator to be processed first SfxViewShell *pVS( SfxViewShell::Current()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
TAGS for emacs
While looking for compatible TAGS file for emacs, I found we have a 'make etags' that is supposed to generates emacs compatible tags file. But this doesn't seem to work, atleast on my fedora box (because the `etags' binary on my system is different and doesn't accept some flags that solenv/bin/create-tags script gives it to, such as --langmap) ctags documentation says, to generate tags in emacs format one either needs to pass -e flag to binary or alternatively "if ctags is invoked by a name containing the string "etags" (either by renaming, or creating a link to, the executable), etags mode will be enabled." Shouldn't it be like this : --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -9,7 +9,7 @@ ctags=ctags if test "$1" = "-e"; then -ctags=etags +ctags="ctags -e" fi to make it work properly ? (unless people have separate `etags' file symbolically linked to ctags binary, which doesn't seem default on most systems). Or is there something I missed here ? -- Regards, Pranav Kant http://pranavk.me ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/detfunc.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 67f4b98b9833f0529cf62928b274ba9234853d2f Author: Markus Mohrhard Date: Sat Mar 12 03:35:39 2016 +0100 fix memory leak in detective sdr objects The SdrObject ownership needs to be transferred from the SdrObjList to the Undo object. Only SdrUndoDelObj takes ownership of the object SdrUndoRemoveObj does not. Change-Id: I28f9c538eb4e54ec89ada8521f63d2f49d47a1ff Reviewed-on: https://gerrit.libreoffice.org/23172 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index ffce77a..7e58c7b 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -689,7 +689,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt ) } for (size_t i=1; i<=nDelCount; ++i) -pModel->AddCalcUndo( new SdrUndoRemoveObj( *ppObj[nDelCount-i] ) ); +pModel->AddCalcUndo( new SdrUndoDelObj( *ppObj[nDelCount-i] ) ); for (size_t i=1; i<=nDelCount; ++i) pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit baa938b44d1067f81a9dad772e1d15eb48fd12e6 Author: Markus Mohrhard Date: Fri Mar 11 09:46:19 2016 +0100 fix memory leak in ucalc Change-Id: Iad38472638438eb52e9e46be0a284adbb8ccb689 Reviewed-on: https://gerrit.libreoffice.org/23169 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 4e02165..d97e92f 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3441,15 +3441,14 @@ void Test::testCopyPasteTranspose() ScDocument aNewClipDoc(SCDOCMODE_CLIP); copyToClip(m_pDoc, aSrcRange, &aNewClipDoc); -::std::unique_ptr pTransClip; -pTransClip.reset(new ScDocument(SCDOCMODE_CLIP)); +::std::unique_ptr pTransClip(new ScDocument(SCDOCMODE_CLIP)); aNewClipDoc.TransposeClip(pTransClip.get(), InsertDeleteFlags::ALL, false); -ScDocument* pTransposedClip = pTransClip.release(); ScRange aDestRange = ScRange(3,1,1,3,3,1);//target: Sheet2.D2:D4 ScMarkData aMark; aMark.SetMarkArea(aDestRange); -m_pDoc->CopyFromClip(aDestRange, aMark, InsertDeleteFlags::ALL, nullptr, pTransposedClip); +m_pDoc->CopyFromClip(aDestRange, aMark, InsertDeleteFlags::ALL, nullptr, pTransClip.get()); +pTransClip.reset(); //check cell content after transposed copy/paste OUString aString = m_pDoc->GetString(3, 3, 1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Difficulty in cloning libreoffice
Hi, On Sat, Mar 12, 2016 at 09:07:51AM +0100, jan iversen wrote: > Not really. > > I assume you follow: > https://wiki.documentfoundation.org/Development/GetInvolved > > For linux the clone command is: > git clone git://anongit.freedesktop.org/libreoffice/core libreoffice FWIW, as fallback these mirrors exist: https://github.com/LibreOffice/core.git https://git.launchpad.net/df-libreoffice Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/stlpool.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 91831f3af171673b67b095ecb70c607bbfca1300
Author: Markus Mohrhard
Date: Fri Mar 11 09:48:08 2016 +0100
use unique_ptr instead of manual new delete
Change-Id: I5cbc792818a61e787d4bdad6b605535cc16c8437
Reviewed-on: https://gerrit.libreoffice.org/23170
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 3493a9c2..2e859f6 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -224,12 +224,12 @@ void ScStyleSheetPool::CreateStandardStyles()
SfxItemSet* pSet= nullptr;
SfxItemSet* pHFSet = nullptr;
SvxSetItem* pHFSetItem = nullptr;
-ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter(
EditEngine::CreatePool(), true );
+std::unique_ptr pEdEngine(new
ScEditEngineDefaulter( EditEngine::CreatePool(), true ));
pEdEngine->SetUpdateMode( false );
EditTextObject* pEmptyTxtObj= pEdEngine->CreateTextObject();
EditTextObject* pTxtObj = nullptr;
-ScPageHFItem* pHeaderItem = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT
);
-ScPageHFItem* pFooterItem = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT
);
+std::unique_ptr pHeaderItem(new ScPageHFItem(
ATTR_PAGE_HEADERRIGHT ));
+std::unique_ptr pFooterItem(new ScPageHFItem(
ATTR_PAGE_FOOTERRIGHT ));
ScStyleSheet* pSheet = nullptr;
::editeng::SvxBorderLineaBorderLine ( &aColBlack, DEF_LINE_WIDTH_2
);
SvxBoxItem aBoxItem( ATTR_BORDER );
@@ -430,9 +430,6 @@ void ScStyleSheetPool::CreateStandardStyles()
delete pTxtObj;
delete pEmptyTxtObj;
-delete pHeaderItem;
-delete pFooterItem;
-delete pEdEngine;
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc_pivottable.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 0295a1f2ac39a0a457f68eae25d44aca28fcb0f8
Author: Markus Mohrhard
Date: Fri Mar 11 09:36:15 2016 +0100
fix memory leak in ucalc
Change-Id: I8a2fd72894651e9c2c7d099f87853804ba483443
Reviewed-on: https://gerrit.libreoffice.org/23168
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 3ec7bd1..ef11505 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -2027,8 +2027,8 @@ void Test::testPivotTableDocFunc()
ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
CPPUNIT_ASSERT_EQUAL_MESSAGE("failed to insert range data at correct
position", aPos, aDataRange.aStart);
-ScDPObject* pDPObj = createDPFromRange(
-m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false);
+std::unique_ptr pDPObj(createDPFromRange(
+m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false));
CPPUNIT_ASSERT_MESSAGE("Failed to create pivot table object.", pDPObj);
@@ -2039,8 +2039,8 @@ void Test::testPivotTableDocFunc()
ScDPCollection* pDPs = m_pDoc->GetDPCollection();
CPPUNIT_ASSERT_MESSAGE("Failed to get pivot table collection.", pDPs);
CPPUNIT_ASSERT_EQUAL(static_cast(1), pDPs->GetCount());
-pDPObj = &(*pDPs)[0];
-ScRange aOutRange = pDPObj->GetOutRange();
+ScDPObject* pDPObject = &(*pDPs)[0];
+ScRange aOutRange = pDPObject->GetOutRange();
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
@@ -2060,7 +2060,7 @@ void Test::testPivotTableDocFunc()
// Remove this pivot table output. This should also clear the pivot cache
// it was referencing.
-bSuccess = aFunc.RemovePivotTable(*pDPObj, false, true);
+bSuccess = aFunc.RemovePivotTable(*pDPObject, false, true);
CPPUNIT_ASSERT_MESSAGE("Failed to remove pivot table output via
ScDBDocFunc.", bSuccess);
CPPUNIT_ASSERT_EQUAL(static_cast(0), pDPs->GetCount());
CPPUNIT_ASSERT_EQUAL(static_cast(0),
pDPs->GetSheetCaches().size());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/stlpool.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 07125507097c7b9f277fe79a6d21c76246fd5bd2
Author: Markus Mohrhard
Date: Fri Mar 11 09:11:02 2016 +0100
no need for fancy delete macros for local variables
Change-Id: Ib81562dda616ab6c9e2ad69c076818a9a2c42085
Reviewed-on: https://gerrit.libreoffice.org/23167
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 68638e9..3493a9c2 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -331,7 +331,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pHFSetItem = new SvxSetItem( static_cast(pSet->Get(
ATTR_PAGE_HEADERSET ) ) );
pSet->Put( *pHFSetItem, ATTR_PAGE_HEADERSET );
pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
-DELETEZ( pHFSetItem );
+delete pHFSetItem;
// Header:
// [empty][\sheet\][empty]
@@ -343,7 +343,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pHeaderItem->SetCenterArea( *pTxtObj );
pHeaderItem->SetRightArea ( *pEmptyTxtObj );
pSet->Put( *pHeaderItem );
-DELETEZ( pTxtObj );
+delete pTxtObj;
// Footer:
// [empty][Page \STR_PAGE\][empty]
@@ -357,7 +357,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pFooterItem->SetCenterArea( *pTxtObj );
pFooterItem->SetRightArea ( *pEmptyTxtObj );
pSet->Put( *pFooterItem );
-DELETEZ( pTxtObj );
+delete pTxtObj;
// 2. Report
@@ -389,7 +389,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pHFSet->Put( aBoxInfoItem );
pSet->Put( *pHFSetItem, ATTR_PAGE_HEADERSET );
pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
-DELETEZ( pHFSetItem );
+delete pHFSetItem;
// Footer:
// [\TABLE\ (\DATA\)][empty][\DATE\, \TIME\]
@@ -401,7 +401,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pTxtObj = pEdEngine->CreateTextObject();
pHeaderItem->SetLeftArea( *pTxtObj );
pHeaderItem->SetCenterArea( *pEmptyTxtObj );
-DELETEZ( pTxtObj );
+delete pTxtObj;
aStr = ", ";
pEdEngine->SetText( aStr );
pEdEngine->QuickInsertField( SvxFieldItem(SvxTimeField(),
EE_FEATURE_FIELD), ESelection(0,2,0,2) );
@@ -409,7 +409,7 @@ void ScStyleSheetPool::CreateStandardStyles()
ESelection() );
pTxtObj = pEdEngine->CreateTextObject();
pHeaderItem->SetRightArea( *pTxtObj );
-DELETEZ( pTxtObj );
+delete pTxtObj;
pSet->Put( *pHeaderItem );
// Footer:
@@ -427,12 +427,12 @@ void ScStyleSheetPool::CreateStandardStyles()
pFooterItem->SetCenterArea( *pTxtObj );
pFooterItem->SetRightArea ( *pEmptyTxtObj );
pSet->Put( *pFooterItem );
-DELETEZ( pTxtObj );
+delete pTxtObj;
-DELETEZ( pEmptyTxtObj );
-DELETEZ( pHeaderItem );
-DELETEZ( pFooterItem );
-DELETEZ( pEdEngine );
+delete pEmptyTxtObj;
+delete pHeaderItem;
+delete pFooterItem;
+delete pEdEngine;
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit bfbb89a77e50d12f9b8cbab063804b023bdcf9fa Author: Markus Mohrhard Date: Fri Mar 11 09:07:30 2016 +0100 fix memory leak in ucalc test Change-Id: I5b0f12020eed953b73f1f1b2f867b33172073487 Reviewed-on: https://gerrit.libreoffice.org/23166 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index c78f321..4e02165 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -4701,14 +4701,14 @@ void Test::testCopyPasteFormulasExternalDoc() ScClipParam aClipParam(aRange, false); ScMarkData aMark; aMark.SetMarkArea(aRange); -ScDocument* pClipDoc = new ScDocument(SCDOCMODE_CLIP); -m_pDoc->CopyToClip(aClipParam, pClipDoc, &aMark); +ScDocument aClipDoc(SCDOCMODE_CLIP); +m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark); InsertDeleteFlags nFlags = InsertDeleteFlags::ALL; aRange = ScRange(1,1,1,1,6,1); ScMarkData aMarkData2; aMarkData2.SetMarkArea(aRange); -rExtDoc.CopyFromClip(aRange, aMarkData2, nFlags, nullptr, pClipDoc); +rExtDoc.CopyFromClip(aRange, aMarkData2, nFlags, nullptr, &aClipDoc); OUString aFormula; rExtDoc.GetFormula(1,1,1, aFormula); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform.cxx |4 +---
sc/source/filter/excel/tokstack.cxx |4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 0b2b3369fcc0c06fdb0a384518a4a799c4aed4f8
Author: Markus Mohrhard
Date: Fri Mar 11 05:39:46 2016 +0100
declare variable when we use it
Change-Id: I7f85568318133b19ccd315ff9084efdd15b3eed7
Reviewed-on: https://gerrit.libreoffice.org/23165
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 201b5c92..2be528a 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1809,8 +1809,6 @@ void ExcelToSc::SetComplRow( ScComplexRefData &rCRD )
void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn )
{
-ScMatrix* pMatrix;
-
sal_uInt8 nByte = aIn.ReaduInt8();
sal_uInt16 nUINT16 = aIn.ReaduInt16();
@@ -1827,7 +1825,7 @@ void ExcelToSc::ReadExtensionArray( unsigned int n,
XclImpStream& aIn )
nRows = nUINT16;
}
-pMatrix = aPool.GetMatrix( n );
+ScMatrix* pMatrix = aPool.GetMatrix( n );
if( nullptr != pMatrix )
{
diff --git a/sc/source/filter/excel/tokstack.cxx
b/sc/source/filter/excel/tokstack.cxx
index 1a8a399..1bafcfbc 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -773,8 +773,6 @@ const TokenId TokenPool::StoreNlf( const ScSingleRefData&
rTr )
const TokenId TokenPool::StoreMatrix()
{
-ScMatrix* pM;
-
if( nElementAkt >= nElement )
if (!GrowElement())
return static_cast(nElementAkt+1);
@@ -786,7 +784,7 @@ const TokenId TokenPool::StoreMatrix()
pElement[ nElementAkt ] = nP_MatrixAkt;
pType[ nElementAkt ] = T_Matrix;
-pM = new ScFullMatrix( 0, 0 );
+ScMatrix* pM = new ScFullMatrix( 0, 0 );
pM->IncRef( );
ppP_Matrix[ nP_MatrixAkt ] = pM;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: leak-suppress.txt
leak-suppress.txt |3 +++ 1 file changed, 3 insertions(+) New commits: commit bb472d035b0329e1efcc03c2b4a2d7651c55b452 Author: Markus Mohrhard Date: Sat Mar 12 03:35:06 2016 +0100 we knowingly leak that during the unit tests Change-Id: I89da499ee654b0803c3485227641e4d97db8ec60 Reviewed-on: https://gerrit.libreoffice.org/23171 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/leak-suppress.txt b/leak-suppress.txt index b4fb50a..a951971 100644 --- a/leak-suppress.txt +++ b/leak-suppress.txt @@ -41,3 +41,6 @@ leak:libfontconfig.so # ignore libGL related leaks, most likely false positives # libGL is not built with asan/lsan leak:libGL.so + +# knowingly leaked in the unit tests to get a SfxMedium +leak:SfxObjectShell::DoInitUnitTest ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/helper/csv_handler.hxx |2 +-
sc/qa/unit/helper/qahelper.cxx |6 +++---
sc/qa/unit/subsequent_export-test.cxx | 18 +-
sc/qa/unit/subsequent_filters-test.cxx |4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 7452a44466607ad9a3c90f801016aa1985397b88
Author: Markus Mohrhard
Date: Mon Feb 29 02:41:04 2016 +0100
use correct cppunit assert macro, loplugin:cppunitassertequals
Change-Id: If50f49e9a14e4594778d12e2890e4ebd47b670d4
Reviewed-on: https://gerrit.libreoffice.org/22756
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/qa/unit/helper/csv_handler.hxx
b/sc/qa/unit/helper/csv_handler.hxx
index 115b6bc..54a0ec4 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -213,7 +213,7 @@ public:
std::cout << "CSVString: " << OUStringToOString(aCSVString,
RTL_TEXTENCODING_UTF8).getStr() << std::endl;
std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
#endif //DEBUG_CSV_HANDLER
-CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab,
aCSVString, aString).getStr(), aString == aCSVString );
+CPPUNIT_ASSERT_EQUAL_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab,
aCSVString, aString).getStr(), aCSVString, aString );
++mnCol;
}
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 96dbf5c..b59beb0 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -281,15 +281,15 @@ void testFormats(ScBootstrapFixture* pTest, ScDocument*
pDoc, sal_Int32 nFormat)
ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(0,0,2);
const ScRangeList& rRange = pCondFormat->GetRange();
-CPPUNIT_ASSERT(rRange == ScRange(0,0,2,3,0,2));
+CPPUNIT_ASSERT_EQUAL(ScRangeList(ScRange(0,0,2,3,0,2)), rRange);
pCondFormat = pDoc->GetCondFormat(0,1,2);
const ScRangeList& rRange2 = pCondFormat->GetRange();
-CPPUNIT_ASSERT(rRange2 == ScRange(0,1,2,0,1,2));
+CPPUNIT_ASSERT_EQUAL(ScRangeList(ScRange(0,1,2,0,1,2)), rRange2);
pCondFormat = pDoc->GetCondFormat(1,1,2);
const ScRangeList& rRange3 = pCondFormat->GetRange();
-CPPUNIT_ASSERT(rRange3 == ScRange(1,1,2,3,1,2));
+CPPUNIT_ASSERT_EQUAL(ScRangeList(ScRange(1,1,2,3,1,2)), rRange3);
}
const SdrOle2Obj* getSingleChartObject(ScDocument& rDoc, sal_uInt16 nPage)
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index c01426a..caeb15d 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -601,10 +601,10 @@ void ScExportTest::testNamedRangeBugfdo62729()
ScRangeName* pNames = rDoc.GetRangeName();
//should be just a single named range
-CPPUNIT_ASSERT(pNames->size() == 1 );
+CPPUNIT_ASSERT_EQUAL(size_t(1), pNames->size());
rDoc.DeleteTab(0);
//should be still a single named range
-CPPUNIT_ASSERT(pNames->size() == 1 );
+CPPUNIT_ASSERT_EQUAL(size_t(1), pNames->size());
ScDocShellRef xDocSh = saveAndReload(xShell, FORMAT_ODS);
xShell->DoClose();
@@ -613,7 +613,7 @@ void ScExportTest::testNamedRangeBugfdo62729()
pNames = rDoc2.GetRangeName();
//after reload should still have a named range
-CPPUNIT_ASSERT(pNames->size() == 1 );
+CPPUNIT_ASSERT_EQUAL(size_t(1), pNames->size());
xDocSh->DoClose();
}
@@ -1262,7 +1262,7 @@ void ScExportTest::testCellNoteExportXLS()
ScDocShellRef xOrigDocSh = loadDoc("notes-on-3-sheets.", FORMAT_ODS);
{
ScDocument& rDoc = xOrigDocSh->GetDocument();
-CPPUNIT_ASSERT_MESSAGE("This document should have 3 sheets.",
rDoc.GetTableCount() == 3);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.",
SCTAB(3), rDoc.GetTableCount());
// Check note's presence.
CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,0,0)));
@@ -1283,7 +1283,7 @@ void ScExportTest::testCellNoteExportXLS()
xOrigDocSh->DoClose();
CPPUNIT_ASSERT(xNewDocSh.Is());
ScDocument& rDoc = xNewDocSh->GetDocument();
-CPPUNIT_ASSERT_MESSAGE("This document should have 3 sheets.",
rDoc.GetTableCount() == 3);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.",
SCTAB(3), rDoc.GetTableCount());
// Check note's presence again.
CPPUNIT_ASSERT( rDoc.HasNote(ScAddress(0,0,0)));
@@ -1315,13 +1315,13 @@ void checkMatrixRange(ScDocument& rDoc, const ScRange&
rRange)
ScAddress aPos(nCol, nRow, rRange.aStart.Tab());
bool bIsMatrix = rDoc.GetMatrixFormulaRange(aPos, aMatRange);
CPPUNIT_ASSERT_MESSAGE("Matrix expected, but not found.",
bIsMatrix);
-CPPUNIT_ASSERT_MESSAGE("Wrong matrix range.", rRange == aMatRange);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong matrix range.", rRange,
aMatRange);
const ScFormulaCell* pCell = rDo
Re: Lode and Chocolate.
> On 12 Mar 2016, at 12:25, David Ostrovsky wrote: > > On Sat Mar 12 09:06:40 UTC 2016, jan iversen wrote: > >>> On 12 Mar 2016, at 09:52, Norbert Thiebaud > wrote: >>> >>> On Sat, Mar 12, 2016 at 2:10 AM, jan iversen >>> wrote: Hi. Just tried the new chocolate setup with lode, works very nicely. > GOOD WORK. It would be even nice if we got it integrated into the first lode > install script, or at least the script check for the prerequsites. >>> >>> lode is meant to be run as a non-admin, on purpose so that the > cygwin >>> installed is owned by the normal user.. which save the back and > forth >>> to install new packages or edit /etc or usr/ >>> and in general it is a good thing to build with a regular user (just >>> like on linux you should not build as root) >>> >>> chocolate, and the stuff it install need to be as 'admin' >>> so that still would require two step... >>> Still that can make things much nicer.. since lode could provide a >>> chocolate wrapper that the user be instructed to run as admin >> Interesting, when I read the instructions, I read that >> install_cygwin.ps1 is run as admin, and ./setup as a normal user (due >> to the fat warning before running ./setup). >> >> My thinking was to have the chocolate steps in install_cygwin.ps1 with >> our "defaults" and command line options to overwrite them. > > This is a valid point. How about provide a new script, say lode_boot > (or some such), that would install all prerequisites (using chocolate + > current install_cygwin.ps1): > > * SDK10, > * MSVC 14.0 > * JDK8 > * Emacs > * Cygwin + all usual suspects: ant, junit, make, nasm, ... > > The workflow for a contributor and/or Jenkins/TB administrator would be > (square brackets steps are optional): > > 0. set up Windows VM > 1. relax Powershell script execution restriction > 2. install Chocolate > 3. clone lode project > 4. cd lode > 5. ./lode_boot # as admin, with some option, like msvc-proffesional, .. > 6. ./setup # as normal user > 7. cd dev/core > [8]. add more autogen.input options > 9. ./autogen.sh > 10. make > [11]. start Emacs, hack, or > [12]. make vs2015-ide-integration > [13]. start MSVC 14.0, hack > > PS. Oh, just saw, that vs2015-ide-integration target wasn't implemented > yet ;-( Would be nice if we would have an easy hack for that. Even better we have a GSoC project for that, because the current integration only covers about 1/3 of the executables/libraries. rgds jan i. > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Lode and Chocolate.
On Sat Mar 12 09:06:40 UTC 2016, jan iversen wrote: >> On 12 Mar 2016, at 09:52, Norbert Thiebaud wrote: >> >> On Sat, Mar 12, 2016 at 2:10 AM, jan iversen >> wrote: >>> Hi. >>> >>> Just tried the new chocolate setup with lode, works very nicely. GOOD WORK. >>> >>> It would be even nice if we got it integrated into the first lode install script, or at least the script check for the prerequsites. >> >> lode is meant to be run as a non-admin, on purpose so that the cygwin >> installed is owned by the normal user.. which save the back and forth >> to install new packages or edit /etc or usr/ >> and in general it is a good thing to build with a regular user (just >> like on linux you should not build as root) >> >> chocolate, and the stuff it install need to be as 'admin' >> so that still would require two step... >> Still that can make things much nicer.. since lode could provide a >> chocolate wrapper that the user be instructed to run as admin >> >Interesting, when I read the instructions, I read that >install_cygwin.ps1 is run as admin, and ./setup as a normal user (due >to the fat warning before running ./setup). > >My thinking was to have the chocolate steps in install_cygwin.ps1 with >our "defaults" and command line options to overwrite them. This is a valid point. How about provide a new script, say lode_boot (or some such), that would install all prerequisites (using chocolate + current install_cygwin.ps1): * SDK10, * MSVC 14.0 * JDK8 * Emacs * Cygwin + all usual suspects: ant, junit, make, nasm, ... The workflow for a contributor and/or Jenkins/TB administrator would be (square brackets steps are optional): 0. set up Windows VM 1. relax Powershell script execution restriction 2. install Chocolate 3. clone lode project 4. cd lode 5. ./lode_boot # as admin, with some option, like msvc-proffesional, .. 6. ./setup # as normal user 7. cd dev/core [8]. add more autogen.input options 9. ./autogen.sh 10. make [11]. start Emacs, hack, or [12]. make vs2015-ide-integration [13]. start MSVC 14.0, hack PS. Oh, just saw, that vs2015-ide-integration target wasn't implemented yet ;-( Would be nice if we would have an easy hack for that. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/lcms2
external/lcms2/ExternalProject_lcms2.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3bd54fd17bddea8b7460279153209729a54c9369 Author: David Ostrovsky Date: Sat Mar 12 08:20:32 2016 +0100 Fix lcms2 on MSVC 14.0 Without explicitly specifying toolset v140, the build was failing when only MSVC 14.0 was installed: The builds tools for v120 (Platform Toolset = 'v120') cannot be found Change-Id: I6fb386d56e38cbf922de5069e70a3d3def147c0b Reviewed-on: https://gerrit.libreoffice.org/23162 Reviewed-by: David Ostrovsky Tested-by: Jenkins diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 6bf69b3..981c1e6 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -19,6 +19,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ $(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade lcms2_DLL.vcxproj,echo up-to-date) && \ MSBuild.exe lcms2_DLL.vcxproj \ + $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \ ,Projects/VC2013/lcms2_DLL) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build error
Hi all, I'm Mayank Gupta. GSoC 2016 aspirant for Libreoffice project 'Add impress shape animations that use real physics engine'. I built Libreoffice on Windows it was successful with errors related to different tests. So, mst_ on IRC told it might be because ATL hadn't been disabled properly. He told me how to handle it and so I made a patch and uploaded to Gerrit. When I built it in visual Studio. Run impress from LO, added animations to a simple text in impress, an error popped up saying 'bad allocation'. I checked RAM usage it peaked to 72%(total 4 gigs RAM) with about 750 MB occupied by Libreoffice just before failure. Then I did a 'make clean' and did 'make' again on source directory. Building visual Studio solution was successful without error. My problems are: 1) when I run Libreoffice from cygwin terminal it shows error: The application cannot be started. A General error occurred while accessing your Central configuration. ( "com.sun.star.configuration.ReadWriteAccess of type com.sun.star.configuration.XReadWriteAccess ") 2) Opening visual Studio solution does nothing. What should I do to solve these problems? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Lode and Chocolate.
> On 12 Mar 2016, at 09:52, Norbert Thiebaud wrote: > > On Sat, Mar 12, 2016 at 2:10 AM, jan iversen > wrote: >> Hi. >> >> Just tried the new chocolate setup with lode, works very nicely. GOOD WORK. >> >> It would be even nice if we got it integrated into the first lode install >> script, or at least the script check for the prerequsites. > > lode is meant to be run as a non-admin, on purpose so that the cygwin > installed is owned by the normal user.. which save the back and forth > to install new packages or edit /etc or usr/ > and in general it is a good thing to build with a regular user (just > like on linux you should not build as root) > > chocolate, and the stuff it install need to be as 'admin' > so that still would require two step... > Still that can make things much nicer.. since lode could provide a > chocolate wrapper that the user be instructed to run as admin > Interesting, when I read the instructions, I read that install_cygwin.ps1 is run as admin, and ./setup as a normal user (due to the fat warning before running ./setup). My thinking was to have the chocolate steps in install_cygwin.ps1 with our "defaults" and command line options to overwrite them. rgds jan i. > Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/scalc/00/0412.xhp |8 source/text/scalc/guide/datapilot_createtable.xhp |2 +- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit cd69c2af776143be1768661c5d4587ce7f9f0335 Author: Adolfo Jayme Barrientos Date: Sat Mar 12 03:01:28 2016 -0600 tdf#98616 Update menu path for creating a pivot table Change-Id: I484974df93271670ecd10562e173bd7a70dc7dda diff --git a/source/text/scalc/00/0412.xhp b/source/text/scalc/00/0412.xhp index bf02bc7..0d7394c 100644 --- a/source/text/scalc/00/0412.xhp +++ b/source/text/scalc/00/0412.xhp @@ -187,13 +187,13 @@ Choose Data - Pivot Table -Choose Data - Pivot Table - Create +Choose Insert - Pivot Table -Choose Data - Pivot Table - Create, in the Select Source dialog choose the option Data source registered in $[officename]. +Choose Insert - Pivot Table, in the Select Source dialog choose the option Data source registered in $[officename]. -Choose Data - Pivot Table - Create, in the Select Source dialog choose the option Current selection. -Choose Data - Pivot Table - Create, in the Select Source dialog choose the option Data source registered in $[officename], click OK to see Select Data Source dialog. +Choose Insert - Pivot Table, in the Select Source dialog choose the option Current selection. +Choose Insert - Pivot Table, in the Select Source dialog choose the option Data source registered in $[officename], click OK to see Select Data Source dialog. Choose Data - Pivot Table - Refresh diff --git a/source/text/scalc/guide/datapilot_createtable.xhp b/source/text/scalc/guide/datapilot_createtable.xhp index 6ffa327..89c692f 100644 --- a/source/text/scalc/guide/datapilot_createtable.xhp +++ b/source/text/scalc/guide/datapilot_createtable.xhp @@ -37,7 +37,7 @@ Position the cursor within a range of cells containing values, row and column headings. -Choose Data - Pivot Table - Create. The Select Source dialog appears. Choose Current selection and confirm with OK. The table headings are shown as buttons in the Pivot Table dialog. Drag these buttons as required and drop them into the layout areas "Page Fields", "Column Fields", "Row Fields" and "Data Fields". +Choose Insert - Pivot Table. The Select Source dialog appears. Choose Current selection and confirm with OK. The table headings are shown as buttons in the Pivot Table dialog. Drag these buttons as required and drop them into the layout areas "Page Fields", "Column Fields", "Row Fields" and "Data Fields". Drag the desired buttons into one of the four areas. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a4fce4071b9bf28b1701083d84575729fc32f82 Author: Adolfo Jayme Barrientos Date: Sat Mar 12 03:01:28 2016 -0600 Updated core Project: help cd69c2af776143be1768661c5d4587ce7f9f0335 tdf#98616 Update menu path for creating a pivot table Change-Id: I484974df93271670ecd10562e173bd7a70dc7dda diff --git a/helpcontent2 b/helpcontent2 index b54536f..cd69c2a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b54536ff09619519e8d5bbd87b08b13fe027abfd +Subproject commit cd69c2af776143be1768661c5d4587ce7f9f0335 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Lode and Chocolate.
On Sat, Mar 12, 2016 at 2:10 AM, jan iversen wrote: > Hi. > > Just tried the new chocolate setup with lode, works very nicely. GOOD WORK. > > It would be even nice if we got it integrated into the first lode install > script, or at least the script check for the prerequsites. lode is meant to be run as a non-admin, on purpose so that the cygwin installed is owned by the normal user.. which save the back and forth to install new packages or edit /etc or usr/ and in general it is a good thing to build with a regular user (just like on linux you should not build as root) chocolate, and the stuff it install need to be as 'admin' so that still would require two step... Still that can make things much nicer.. since lode could provide a chocolate wrapper that the user be instructed to run as admin Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
GSoC and mentors.
Hi By now all mentors should have received an email from GSoC telling that they are not "official" mentors. If you did not receive such an email, but expected it, let me know. thanks in advance rgds jan i. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Development on Windows
> On 12 Mar 2016, at 09:13, gaurav sharma wrote: > > Is their any problem with working on windows as compared to linux. Not really, it is slower but that is all. Windows is seen more complicated because many of our windows developers are not used to the unix tools (cygwin), which we also use on windows. the recommended setup on windows is different it uses our lode project. rgds jan i. > > Regards > Gaurav > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configmgr/source sw/source
configmgr/source/components.cxx|2 +-
sw/source/core/text/blink.cxx |2 +-
sw/source/core/unocore/unoportenum.cxx | 16
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 8eef10a5fd6ce6373fb54ee3d9ab053c997d2785
Author: Julien Nabet
Date: Sat Mar 12 01:43:09 2016 +0100
Let's use the iterator return by erase method (part b)
std::list seems ok but let's try for std::set and std::multiset
Change-Id: I1d4875468517c732680ba98ac9f2e08d1baa61bd
Reviewed-on: https://gerrit.libreoffice.org/23161
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 3f94a8d..3ba2640 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -774,7 +774,7 @@ void Components::parseXcdFiles(int layer, OUString const &
url) {
for (UnresolvedList::iterator i(unres.begin()); i != unres.end();) {
if (i->manager->parse(&existingDeps)) {
processedDeps.insert(i->name);
-unres.erase(i++);
+i = unres.erase(i);
isResolved = true;
} else {
++i;
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 9588973..4fd56d2 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -166,7 +166,7 @@ void SwBlink::FrameDelete( const SwRootFrame* pRoot )
for (SwBlinkSet::iterator it = m_List.begin(); it != m_List.end(); )
{
if (pRoot == (*it)->GetRootFrame())
-m_List.erase( it++ );
+it = m_List.erase(it);
else
++it;
}
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index c1aad4c..e7cec35 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -617,7 +617,7 @@ static void lcl_ExportBookmark(
SwXBookmarkPortion_ImplSharedPtr pPtr = (*aIter);
if ( nIndex > pPtr->getIndex() )
{
-rBkmArr.erase( aIter++ );
+aIter = rBkmArr.erase(aIter);
continue;
}
if ( nIndex < pPtr->getIndex() )
@@ -641,7 +641,7 @@ static void lcl_ExportBookmark(
rPortions.push_back(pPortion);
pPortion->SetBookmark(pPtr->xBookmark);
}
-rBkmArr.erase( aIter++ );
+aIter = rBkmArr.erase(aIter);
}
}
@@ -658,7 +658,7 @@ static void lcl_ExportSoftPageBreak(
{
if ( nIndex > *aIter )
{
-rBreakArr.erase( aIter++ );
+aIter = rBreakArr.erase(aIter);
continue;
}
if ( nIndex < *aIter )
@@ -666,7 +666,7 @@ static void lcl_ExportSoftPageBreak(
rPortions.push_back(
new SwXTextPortion(pUnoCursor, xParent, PORTION_SOFT_PAGEBREAK) );
-rBreakArr.erase( aIter++ );
+aIter = rBreakArr.erase(aIter);
}
}
@@ -1113,13 +1113,13 @@ static void lcl_ExportRedline(
sal_Int32 nRealIndex = pPtr->getRealIndex();
// MTG: 23/11/05: If there are elements before nIndex, remove them
if ( nIndex > nRealIndex )
-rRedlineArr.erase ( aIter++ );
+aIter = rRedlineArr.erase(aIter);
// MTG: 23/11/05: If the elements match, and them to the list
else if ( nIndex == nRealIndex )
{
rPortions.push_back( new SwXRedlinePortion(
*pPtr->m_pRedline, pUnoCursor, xParent,
pPtr->m_bStart));
-rRedlineArr.erase ( aIter++ );
+aIter = rRedlineArr.erase(aIter);
}
// MTG: 23/11/05: If we've iterated past nIndex, exit the loop
else
@@ -1161,7 +1161,7 @@ static void lcl_ExportAnnotationStarts(
SwAnnotationStartPortion_ImplSharedPtr pPtr = (*aIter);
if ( nIndex > pPtr->getIndex() )
{
-rAnnotationStartArr.erase( aIter++ );
+aIter = rAnnotationStartArr.erase(aIter);
continue;
}
if ( pPtr->getIndex() > nIndex )
@@ -1174,7 +1174,7 @@ static void lcl_ExportAnnotationStarts(
pPortion->SetTextField( pPtr->mxAnnotationField );
rPortions.push_back(pPortion);
-rAnnotationStartArr.erase( aIter++ );
+aIter = rAnnotationStartArr.erase(aIter);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Development on Windows
Is their any problem with working on windows as compared to linux. Regards Gaurav ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Lode and Chocolate.
Hi. Just tried the new chocolate setup with lode, works very nicely. GOOD WORK. It would be even nice if we got it integrated into the first lode install script, or at least the script check for the prerequsites. keep up the good work rgds jan i. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Difficulty in cloning libreoffice
Not really. I assume you follow: https://wiki.documentfoundation.org/Development/GetInvolved For linux the clone command is: git clone git://anongit.freedesktop.org/libreoffice/core libreoffice for windows the clone command is git clone git://gerrit.libreoffice.org/lode rgds jan i. > On 12 Mar 2016, at 09:03, gaurav sharma wrote: > > I am not able to clone libreoffice from the link given on easy hacks page. > Is their any alternative to clone libreoffice repository. > > Regards > Gaurav > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Difficulty in cloning libreoffice
I am not able to clone libreoffice from the link given on easy hacks page. Is their any alternative to clone libreoffice repository. Regards Gaurav ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
