[Libreoffice-commits] core.git: sw/source
sw/source/core/view/viewsh.cxx |2 +-
sw/source/core/view/vnew.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c31bc23d23ca5bd973cd9dd823e99cb42b440953
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 3 09:28:10 2014 +0100
loplugin:implicitboolconversion
Change-Id: I8c8b8211416916d612ade161ea4a742166b95574
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 7659f76..973576c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -483,7 +483,7 @@ void SwViewShell::ImplUnlockPaint( sal_Bool bVirDev )
sal_Bool SwViewShell::AddPaintRect( const SwRect rRect )
{
-sal_Bool bRet = sal_False;
+bool bRet = false;
SwViewShell *pSh = this;
do
{
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 990a5dfb..c509b3f 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -362,7 +362,7 @@ SwViewShell::~SwViewShell()
sal_Bool SwViewShell::HasDrawView() const
{
-return Imp() ? Imp()-HasDrawView() : 0;
+return Imp() Imp()-HasDrawView();
}
void SwViewShell::MakeDrawView()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unmet Dependencies Ubuntu 13.10
Hi Joel, I have recently installed LO on ubuntu 13.10 and was successful. This error I have face in general many times and its due to the apt sources. Like a higher version of a package is required and Ubuntu is not able to retrieve that version. May be apt-get update will work else try generating sources.list again and then apt-get update. The file sources.list is at /etc/apt/sources.list From this website, i generated sources.list file. http://repogen.simplylinux.ch/ May be this could help. Greetings Anurag On Mon, Mar 3, 2014 at 8:21 AM, Joel Madero jmadero@gmail.com wrote: Hi All, So something is up and I'm getting errors when I try to build the dependencies needed to build LibreOffice: joel@Studio-1737:/data/libreoffice/instdir/program$ sudo apt-get build-dep libreoffice [sudo] password for joel: Reading package lists... Done Building dependency tree Reading state information... Done The following packages have unmet dependencies: libmdds-dev : Depends: libboost1.54-dev (= 1.39) but it is not going to be installed libmysqlcppconn-dev : Depends: libboost1.54-dev but it is not going to be installed E: Build-dependencies for libreoffice could not be satisfied. Suggestions? I really don't want to install one by one :-/ All the best, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source vcl/source
svx/source/svdraw/sdrpaintwindow.cxx | 96 ---
vcl/source/window/window.cxx |5 +
2 files changed, 83 insertions(+), 18 deletions(-)
New commits:
commit dc5b0d326ce4e5e182611a50337226259775ab83
Author: Caolán McNamara caol...@redhat.com
Date: Fri Feb 28 16:55:03 2014 +
Resolves: rhbz#1007697 Update on a Window triggering delete on window
Reviewed-on: https://gerrit.libreoffice.org/8396
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 1ec2880679d88c89901ce00fe30dd78e584f6960)
Conflicts:
svx/source/svdraw/sdrpaintwindow.cxx
vcl/source/window/window.cxx
Change-Id: Ic6374ce45e3a3ba97217ae77e91f9143f46e277b
Reviewed-on: https://gerrit.libreoffice.org/8398
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index 6abacc5..81dff0b 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -22,35 +22,95 @@
#include svx/svdpntv.hxx
#include vcl/gdimtf.hxx
#include vcl/svapp.hxx
+#include set
+#include vector
+
+//rhbz#1007697 do this in two loops, one to collect the candidates
+//and another to update them because updating a candidate can
+//trigger the candidate to be deleted, so asking for its
+//sibling after that is going to fail hard
+class CandidateMgr
+{
+std::vectorWindow* m_aCandidates;
+std::setWindow* m_aDeletedCandidates;
+DECL_LINK(WindowEventListener, VclSimpleEvent*);
+public:
+void PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect);
+~CandidateMgr();
+};
+
+IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+VclWindowEvent* pWinEvent = dynamic_cast VclWindowEvent* ( pEvent );
+if (pWinEvent)
+{
+Window* pWindow = pWinEvent-GetWindow();
+if (pWinEvent-GetId() == VCLEVENT_OBJECT_DYING)
+{
+m_aDeletedCandidates.insert(pWindow);
+}
+}
+return 0;
+}
+
+CandidateMgr::~CandidateMgr()
+{
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+Window* pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+pCandidate-RemoveEventListener(LINK(this, CandidateMgr,
WindowEventListener));
+}
+}
void PaintTransparentChildren(Window rWindow, Rectangle const rPixelRect)
{
-if (rWindow.IsChildTransparentModeEnabled())
+if (!rWindow.IsChildTransparentModeEnabled())
+return;
+
+CandidateMgr aManager;
+aManager.PaintTransparentChildren(rWindow, rPixelRect);
+}
+
+void CandidateMgr::PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect)
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+while (pCandidate)
{
-Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
-while (pCandidate)
+if (pCandidate-IsPaintTransparent())
{
-if (pCandidate-IsPaintTransparent())
+const Rectangle aCandidatePosSizePixel(
+pCandidate-GetPosPixel(),
+pCandidate-GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(rPixelRect))
{
-const Rectangle aCandidatePosSizePixel(
-pCandidate-GetPosPixel(),
-pCandidate-GetSizePixel());
-
-if (aCandidatePosSizePixel.IsOver(rPixelRect))
-{
-pCandidate-Invalidate(
-INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-// important: actually paint the child here!
-pCandidate-Update();
-}
+m_aCandidates.push_back(pCandidate);
+pCandidate-AddEventListener(LINK(this, CandidateMgr,
WindowEventListener));
}
-pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
+pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
-}
-
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+//rhbz#1007697 this can cause the window itself to be
+//deleted. So we are listening to see if that happens
+//and if so, then skip the update
+pCandidate-Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
+// important: actually paint the child here!
+if
[Libreoffice-commits] core.git: 4 commits - config_host/config_features.h.in configure.ac sc/qa writerfilter/source
config_host/config_features.h.in |5 +
configure.ac | 20 +
sc/qa/unit/data/xlsx/universal-content-strict.xlsx |binary
sc/qa/unit/filters-test.cxx| 84 ++---
sc/qa/unit/helper/qahelper.cxx | 67
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx| 36 ++---
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 39 +
7 files changed, 165 insertions(+), 86 deletions(-)
New commits:
commit 13a30b3a109c39ce346ea5bc1f35889209bb375b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 3 10:52:05 2014 +0100
remove remaining parts of the old crash testing
Change-Id: I2282d2ee8304bdc9dbdf24c5a22c16d0e742deb7
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 74a68ae..4de62d1 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -20,8 +20,6 @@
#include sfx2/sfxmodelfactory.hxx
#include svl/stritem.hxx
-#define TEST_BUG_FILES 0
-
#include helper/qahelper.hxx
#include docsh.hxx
@@ -70,14 +68,6 @@ public:
void testContentXLS_XML();
void testSharedFormulaXLS();
void testSharedFormulaXLSX();
-#if TEST_BUG_FILES
-//goes recursively through all files in this dir and tries to open them
-void testDir(osl::Directory rDir, sal_Int32 nType);
-//test Bug Files and search for files that crash LibO
-void testBugFiles();
-void testBugFilesXLS();
-void testBugFilesXLSX();
-#endif
void testLegacyCellAnchoredRotatedShape();
CPPUNIT_TEST_SUITE(ScFiltersTest);
@@ -93,11 +83,6 @@ public:
CPPUNIT_TEST(testSharedFormulaXLSX);
CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
-#if TEST_BUG_FILES
-CPPUNIT_TEST(testBugFiles);
-CPPUNIT_TEST(testBugFilesXLS);
-CPPUNIT_TEST(testBugFilesXLSX);
-#endif
CPPUNIT_TEST_SUITE_END();
private:
@@ -134,64 +119,6 @@ void ScFiltersTest::testCVEs()
#endif
}
-#if TEST_BUG_FILES
-
-void ScFiltersTest::testDir(osl::Directory rDir, sal_uInt32 nType)
-{
-OUString aFilterName(getFileFormats()[nType].pFilterName,
strlen(getFileFormats()[nType].pFilterName), RTL_TEXTENCODING_UTF8) ;
-OUString aFilterType(getFileFormats()[nType].pTypeName,
strlen(getFileFormats()[nType].pTypeName), RTL_TEXTENCODING_UTF8);
-
-osl::DirectoryItem aItem;
-osl::FileStatus
aFileStatus(osl_FileStatus_Mask_FileURL|osl_FileStatus_Mask_Type);
-while (rDir.getNextItem(aItem) == osl::FileBase::E_None)
-{
-aItem.getFileStatus(aFileStatus);
-OUString sURL = aFileStatus.getFileURL();
-std::cout File: OUStringToOString(sURL,
RTL_TEXTENCODING_UTF8).getStr() std::endl;
-//OStringBuffer aMessage(Failed loading: );
-//aMessage.append(OUStringToOString(sURL, RTL_TEXTENCODING_UTF8));
-
-unsigned int nFormatType = getFileFormats()[nType].nFormatType;
-unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-ScDocShellRef xDocSh = load(sURL, aFilterName, OUString(),
-aFilterType, nFormatType, nClipboardId );
-// use this only if you're sure that all files can be loaded
-// pay attention to lock files
-//CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), xDocSh.Is());
-if (xDocSh.Is())
-xDocSh-DoClose();
-}
-}
-
-void ScFiltersTest::testBugFiles()
-{
-OUString aDirName = getURLFromSrc(/sc/qa/unit/data/bugODS/);
-osl::Directory aDir(aDirName);
-
-CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.open());
-testDir(aDir, 0);
-}
-
-void ScFiltersTest::testBugFilesXLS()
-{
-OUString aDirName = getURLFromSrc(/sc/qa/unit/data/bugXLS/);
-osl::Directory aDir(aDirName);
-
-CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.open());
-testDir(aDir, 1);
-}
-
-void ScFiltersTest::testBugFilesXLSX()
-{
-OUString aDirName = getURLFromSrc(/sc/qa/unit/data/bugXLSX/);
-osl::Directory aDir(aDirName);
-
-CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.open());
-testDir(aDir, 2);
-}
-
-#endif
-
namespace {
void testRangeNameImpl(ScDocument* pDoc)
commit 69e14b0fee1c474168d8159b874d7c2fd9dea64f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 3 10:49:37 2014 +0100
add experimental export file validation
In calc unit tests we validate the exported OOXML files now with
officeotron.
For this there must be a script called officeotron that takes the file
path.
Currently the generated files are still invalid but I'm going to fix it.
Change-Id: I1809b9457a535dbbe6a72f3778dfb53db168bbda
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 0f63f26..6a46e1c 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -120,4 +120,9 @@
*/
#define HAVE_FT_FACE_GETCHARVARIANTINDEX 0
+/*
+ * Whether to
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - svx/source vcl/source
svx/source/svdraw/sdrpaintwindow.cxx | 96 ---
vcl/source/window/window.cxx |5 +
2 files changed, 83 insertions(+), 18 deletions(-)
New commits:
commit fa3c550a8eeb4a7be3ec4afe0540c1320d321110
Author: Caolán McNamara caol...@redhat.com
Date: Fri Feb 28 16:55:03 2014 +
Resolves: rhbz#1007697 Update on a Window triggering delete on window
Reviewed-on: https://gerrit.libreoffice.org/8396
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 1ec2880679d88c89901ce00fe30dd78e584f6960)
Conflicts:
svx/source/svdraw/sdrpaintwindow.cxx
vcl/source/window/window.cxx
Change-Id: Ic6374ce45e3a3ba97217ae77e91f9143f46e277b
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index 6ab2b40..da94126 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -22,35 +22,95 @@
#include svx/svdpntv.hxx
#include vcl/gdimtf.hxx
#include vcl/svapp.hxx
+#include set
+#include vector
+
+//rhbz#1007697 do this in two loops, one to collect the candidates
+//and another to update them because updating a candidate can
+//trigger the candidate to be deleted, so asking for its
+//sibling after that is going to fail hard
+class CandidateMgr
+{
+std::vectorWindow* m_aCandidates;
+std::setWindow* m_aDeletedCandidates;
+DECL_LINK(WindowEventListener, VclSimpleEvent*);
+public:
+void PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect);
+~CandidateMgr();
+};
+
+IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+VclWindowEvent* pWinEvent = dynamic_cast VclWindowEvent* ( pEvent );
+if (pWinEvent)
+{
+Window* pWindow = pWinEvent-GetWindow();
+if (pWinEvent-GetId() == VCLEVENT_OBJECT_DYING)
+{
+m_aDeletedCandidates.insert(pWindow);
+}
+}
+return 0;
+}
+
+CandidateMgr::~CandidateMgr()
+{
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+Window* pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+pCandidate-RemoveEventListener(LINK(this, CandidateMgr,
WindowEventListener));
+}
+}
void PaintTransparentChildren(Window rWindow, Rectangle const rPixelRect)
{
-if (rWindow.IsChildTransparentModeEnabled())
+if (!rWindow.IsChildTransparentModeEnabled())
+return;
+
+CandidateMgr aManager;
+aManager.PaintTransparentChildren(rWindow, rPixelRect);
+}
+
+void CandidateMgr::PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect)
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+while (pCandidate)
{
-Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
-while (pCandidate)
+if (pCandidate-IsPaintTransparent())
{
-if (pCandidate-IsPaintTransparent())
+const Rectangle aCandidatePosSizePixel(
+pCandidate-GetPosPixel(),
+pCandidate-GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(rPixelRect))
{
-const Rectangle aCandidatePosSizePixel(
-pCandidate-GetPosPixel(),
-pCandidate-GetSizePixel());
-
-if (aCandidatePosSizePixel.IsOver(rPixelRect))
-{
-pCandidate-Invalidate(
-INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-// important: actually paint the child here!
-pCandidate-Update();
-}
+m_aCandidates.push_back(pCandidate);
+pCandidate-AddEventListener(LINK(this, CandidateMgr,
WindowEventListener));
}
-pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
+pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
-}
-
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+//rhbz#1007697 this can cause the window itself to be
+//deleted. So we are listening to see if that happens
+//and if so, then skip the update
+pCandidate-Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
+// important: actually paint the child here!
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+pCandidate-Update();
+}
+}
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source vcl/source
svx/source/svdraw/sdrpaintwindow.cxx | 96 ---
vcl/source/window/window.cxx |5 +
2 files changed, 83 insertions(+), 18 deletions(-)
New commits:
commit ff2704d22bab86d9e58df812bc01482cfb4bb262
Author: Caolán McNamara caol...@redhat.com
Date: Fri Feb 28 16:55:03 2014 +
Resolves: rhbz#1007697 Update on a Window triggering delete on window
Reviewed-on: https://gerrit.libreoffice.org/8396
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 1ec2880679d88c89901ce00fe30dd78e584f6960)
Conflicts:
svx/source/svdraw/sdrpaintwindow.cxx
vcl/source/window/window.cxx
Change-Id: Ic6374ce45e3a3ba97217ae77e91f9143f46e277b
Reviewed-on: https://gerrit.libreoffice.org/8400
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index 6ab2b40..da94126 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -22,35 +22,95 @@
#include svx/svdpntv.hxx
#include vcl/gdimtf.hxx
#include vcl/svapp.hxx
+#include set
+#include vector
+
+//rhbz#1007697 do this in two loops, one to collect the candidates
+//and another to update them because updating a candidate can
+//trigger the candidate to be deleted, so asking for its
+//sibling after that is going to fail hard
+class CandidateMgr
+{
+std::vectorWindow* m_aCandidates;
+std::setWindow* m_aDeletedCandidates;
+DECL_LINK(WindowEventListener, VclSimpleEvent*);
+public:
+void PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect);
+~CandidateMgr();
+};
+
+IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+VclWindowEvent* pWinEvent = dynamic_cast VclWindowEvent* ( pEvent );
+if (pWinEvent)
+{
+Window* pWindow = pWinEvent-GetWindow();
+if (pWinEvent-GetId() == VCLEVENT_OBJECT_DYING)
+{
+m_aDeletedCandidates.insert(pWindow);
+}
+}
+return 0;
+}
+
+CandidateMgr::~CandidateMgr()
+{
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+Window* pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+pCandidate-RemoveEventListener(LINK(this, CandidateMgr,
WindowEventListener));
+}
+}
void PaintTransparentChildren(Window rWindow, Rectangle const rPixelRect)
{
-if (rWindow.IsChildTransparentModeEnabled())
+if (!rWindow.IsChildTransparentModeEnabled())
+return;
+
+CandidateMgr aManager;
+aManager.PaintTransparentChildren(rWindow, rPixelRect);
+}
+
+void CandidateMgr::PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect)
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+while (pCandidate)
{
-Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
-while (pCandidate)
+if (pCandidate-IsPaintTransparent())
{
-if (pCandidate-IsPaintTransparent())
+const Rectangle aCandidatePosSizePixel(
+pCandidate-GetPosPixel(),
+pCandidate-GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(rPixelRect))
{
-const Rectangle aCandidatePosSizePixel(
-pCandidate-GetPosPixel(),
-pCandidate-GetSizePixel());
-
-if (aCandidatePosSizePixel.IsOver(rPixelRect))
-{
-pCandidate-Invalidate(
-INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-// important: actually paint the child here!
-pCandidate-Update();
-}
+m_aCandidates.push_back(pCandidate);
+pCandidate-AddEventListener(LINK(this, CandidateMgr,
WindowEventListener));
}
-pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
+pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
-}
-
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+//rhbz#1007697 this can cause the window itself to be
+//deleted. So we are listening to see if that happens
+//and if so, then skip the update
+pCandidate-Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
+// important: actually paint the child here!
+if
Re: Unmet Dependencies Ubuntu 13.10
Hi Joel,
On Sun, Mar 02, 2014 at 06:51:35PM -0800, Joel Madero wrote:
The following packages have unmet dependencies:
libmdds-dev : Depends: libboost1.54-dev (= 1.39) but it is not
going to be installed
libmysqlcppconn-dev : Depends: libboost1.54-dev but it is not going
to be installed
E: Build-dependencies for libreoffice could not be satisfied.
'libboost1.54-dev (= 1.39)' should be in 13.10 (saucy):
https://launchpad.net/ubuntu/saucy/+package/libboost1.54-dev
So you'll have to find out why apt thinks its a a bad idea to install it ('but
it is not going to be installed'). To find out more, one easy step would be to:
apt-get install libboost1.54-dev
and see what is being complained about (And possibly repeat that with more 'but
it is not going to be installed's until you find the root problem).
Best,
Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - accessibility/source
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 4040c461fc244940c6817770104ccbcc013ac1f3
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Feb 21 21:55:59 2014 +0100
cppcheck: duplicateIf
- replace duplicate TIB_DROPDOWN test with TIB_DROPDOWN + TIB_DROPDOWNONLY
- consider also TIB_RADIOCHECK as AccessibleRole::TOGGLE_BUTTON
Change-Id: Id159349ae1515681f47c373ba3d839ed406284ab
Reviewed-on: https://gerrit.libreoffice.org/8164
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/8371
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 04889bf..4f1d68f 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -82,10 +82,16 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
case TOOLBOXITEM_BUTTON :
{
ToolBoxItemBits nBits = m_pToolBox-GetItemBits( m_nItemId );
-if (( nBits TIB_DROPDOWN ) == TIB_DROPDOWN)
+if (
+ (( nBits TIB_DROPDOWN ) == TIB_DROPDOWN) ||
+ (( nBits TIB_DROPDOWNONLY ) == TIB_DROPDOWNONLY)
+ )
m_nRole = AccessibleRole::BUTTON_DROPDOWN;
-else if (( ( nBits TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
-( ( nBits TIB_AUTOCHECK ) == TIB_AUTOCHECK ) )
+else if (
+( ( nBits TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
+( ( nBits TIB_RADIOCHECK ) == TIB_RADIOCHECK ) ||
+( ( nBits TIB_AUTOCHECK ) == TIB_AUTOCHECK )
+ )
m_nRole = AccessibleRole::TOGGLE_BUTTON;
else if ( m_pToolBox-GetItemWindow( m_nItemId ) )
m_nRole = AccessibleRole::PANEL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |9 +++-
vcl/unx/kde4/KDE4FilePicker.hxx |5 ++
vcl/unx/kde4/KDEData.cxx| 17
vcl/unx/kde4/KDESalGraphics.cxx | 53 ---
vcl/unx/kde4/KDESalInstance.cxx |5 ++
vcl/unx/kde4/KDESalInstance.hxx |1
vcl/unx/kde4/KDEXLib.cxx| 77
vcl/unx/kde4/KDEXLib.hxx|7 +++
8 files changed, 104 insertions(+), 70 deletions(-)
New commits:
commit 7163d64b90ac4d4259b1d0379cfca348dd30601c
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Thu Feb 27 20:34:00 2014 +
KDE4: evaluate frameWidth in the Qt thread
When opening a document via Java UNO without a running LO instance, one
gets the following Qt error messages:
CE QObject: Cannot create children for a parent that is in a different
thread.
CE (Parent is Oxygen::WidgetStateEngine(0x8deb878), parent's thread is
QThread(0x8d6cf70), current thread is QThread(0xa8fa7fc8)
CE QObject::installEventFilter(): Cannot filter events for objects in a
different thread.
CE QObject::installEventFilter(): Cannot filter events for objects in a
different thread.
CE QObject::installEventFilter(): Cannot filter events for objects in a
different thread.
This happens, because the Java UNO call is processed in the first /
Qt thread while document loading happens in a second thread.
Document loading actually just calls getNativeControlRegion, which
should not involve any drawing. But the KDE4 backend does some style
processing to get the correct frame width (QWidget::ensurePolished(),
which uses GUI based events and need to be processed in the Qt
thread.
Change-Id: I344d5089d958963c48a9a8a84bfa9fe8f092b75a
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index a41b0cd1..4fbe79b 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -31,10 +31,12 @@
#undef Region
#include KDESalGraphics.hxx
+#include KDESalInstance.hxx
#include vcl/settings.hxx
#include vcl/decoview.hxx
#include rtl/ustrbuf.hxx
+#include unx/saldata.hxx
using namespace ::rtl;
@@ -165,21 +167,6 @@ namespace
kapp-style()-drawComplexControl(element, option, painter);
}
-int getFrameWidth()
-{
-static int s_nFrameWidth = -1;
-if( s_nFrameWidth 0 )
-{
-// fill in a default
-QFrame aFrame( NULL );
-aFrame.setFrameRect( QRect(0, 0, 100, 30) );
-aFrame.setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
-aFrame.ensurePolished();
-s_nFrameWidth = aFrame.frameWidth();
-}
-return s_nFrameWidth;
-}
-
void lcl_drawFrame(QStyle::PrimitiveElement element, QImage* image,
QStyle::State state)
{
#if ( QT_VERSION = QT_VERSION_CHECK( 4, 5, 0 ) )
@@ -554,7 +541,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type,
ControlPart part,
vclStateValue2StateFlag(nControlState, value) );
// draw just the border, see
http://qa.openoffice.org/issues/show_bug.cgi?id=107945
-int fw = getFrameWidth();
+int fw = static_cast KDESalInstance*
(GetSalData()-m_pInstance)-getFrameWidth();
clipRegion = new QRegion( QRegion( widgetRect ).subtracted(
widgetRect.adjusted( fw, fw, -fw, -fw )));
}
else if (type == CTRL_WINDOW_BACKGROUND)
@@ -857,7 +844,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType
type, ControlPart part,
{
if( part == PART_BORDER )
{
-int nFrameWidth = getFrameWidth();
+int nFrameWidth = static_cast KDESalInstance*
(GetSalData()-m_pInstance)-getFrameWidth();
sal_uInt16 nStyle = val.getNumericVal();
if( nStyle FRAME_DRAW_NODRAW )
{
diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index 224ac3a..9670172 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.cxx
@@ -38,4 +38,9 @@ uno::Reference ui::dialogs::XFilePicker2
KDESalInstance::createFilePicker(
static_castKDEXLib*( mpXLib )-createFilePicker(xMSF) );
}
+int KDESalInstance::getFrameWidth()
+{
+return static_castKDEXLib*( mpXLib )-getFrameWidth();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 3c07f52..f73af0d 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -36,6 +36,7 @@ class KDESalInstance : public X11SalInstance
virtual com::sun::star::uno::Reference
com::sun::star::ui::dialogs::XFilePicker2
createFilePicker( const com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext );
+int getFrameWidth();
};
/* vim:set
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/ui/WizardDialog.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97822e3cbc63d3bd110bc3c654b3fbb4d4d1904c Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 3 11:57:34 2014 +0100 Wizards should look for templates in Template_internal, not Template_user ...as only the former reliably denotes the share/template tree where the wizard templates are stored. (Presumably the latter defaulted to the former as long as it wasn't explicitly set in the past, but is now always explicitly set since 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2 Resolves: rhbz#1065807 use xdg ~/Templates for default Template location.) Change-Id: I7d1ac47d821c778fe342865465d0505a94b824bf diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py index 6cf9bc5..4e41fdf 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.py +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py @@ -126,7 +126,7 @@ class WizardDialog(UnoDialog2): xPropertySet = \ self.xMSF.createInstance(com.sun.star.util.PathSettings) self.sTemplatePath = \ -xPropertySet.getPropertyValue(Template_user)[0] +xPropertySet.getPropertyValue(Template_internal)[0] self.sUserTemplatePath = \ xPropertySet.getPropertyValue(Template_writable) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Current Build from Git: Writer-Wizzards don't run
On 03/02/2014 05:45 PM, Andreas Mantke wrote: I build LibreOffice from the current master on my openSuSE 12.3-x64 and the Writer wizzards don't run anymore. Fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=97822e3cbc63d3bd110bc3c654b3fbb4d4d1904c Wizards should look for templates in Template_internal, not Template_user. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60924] move libraries to autoinstallation in scp2
https://bugs.freedesktop.org/show_bug.cgi?id=60924 --- Comment #68 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Matuš Kukan committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=083fa76745d0c8cb095d856df633866c117b0f3a fdo#60924: Autoinstall lpsolve package. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/qa include/oox oox/source
chart2/qa/extras/chart2export.cxx | 10 ++
chart2/qa/extras/data/docx/testSeriesIdxOrder.docx |binary
include/oox/export/chartexport.hxx |1 +
oox/source/export/chartexport.cxx |7 +--
4 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 9ca4fa05eb5ec7d0d7c3f4a83489013e140d2f0b
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Fri Feb 21 11:03:35 2014 +0530
fdo#74826: File corruption-Issue related to Series idx order val.
Problem Description:
- If the document contains more than one charts together.
ex.Bar Line chart
- In that case, LO writes idx order val equal to 0,
instead of 1 for second chart series.
- After roundtrip, the document get corrupted.
Implementation:
- Added varible to take the series count
in case of multiple chart.
Note:
- Some of the UT's are failing when --enable-dbgutil is enabled.
Change-Id: I40606b4d69026939fa19ae534dd7b2bb36ec97fc
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 8c7e7b3..e3554e5 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -48,6 +48,7 @@ public:
void testBarChartRotation();
void testShapeFollowedByChart();
void testPieChartDataLabels();
+void testSeriesIdxOrder();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -68,6 +69,7 @@ public:
CPPUNIT_TEST(testBarChartRotation);
CPPUNIT_TEST(testShapeFollowedByChart);
CPPUNIT_TEST(testPieChartDataLabels);
+CPPUNIT_TEST(testSeriesIdxOrder);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -610,6 +612,14 @@ void Chart2ExportTest::testPieChartDataLabels()
assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos,
val, bestFit);
}
+void Chart2ExportTest::testSeriesIdxOrder()
+{
+load(/chart2/qa/extras/data/docx/, testSeriesIdxOrder.docx);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart, Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1],
val, 1);
+assertXPath(pXmlDoc,
/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1],
val, 1);
+}
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/testSeriesIdxOrder.docx
b/chart2/qa/extras/data/docx/testSeriesIdxOrder.docx
new file mode 100644
index 000..9274e2c
Binary files /dev/null and b/chart2/qa/extras/data/docx/testSeriesIdxOrder.docx
differ
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index 04a5e20..b95fc58 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -83,6 +83,7 @@ public:
private:
sal_Int32 mnXmlNamespace;
+sal_Int32 mnSeriesCount;
FractionmaFraction;
::com::sun::star::uno::Reference ::com::sun::star::frame::XModel
mxChartModel;
com::sun::star::uno::Reference com::sun::star::chart::XDiagram
mxDiagram;
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 4250cb7..9f8df56 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -438,6 +438,7 @@ sal_Int32 lcl_generateRandomValue()
ChartExport::ChartExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, Reference
frame::XModel xModel, XmlFilterBase* pFB, DocumentType eDocumentType )
: DrawingML( pFS, pFB, eDocumentType )
, mnXmlNamespace( nXmlNamespace )
+, mnSeriesCount(0)
, maFraction( 1, 576 )
, mxChartModel( xModel )
, mbHasCategoryLabels( sal_False )
@@ -1041,9 +1042,11 @@ void ChartExport::exportPlotArea( )
aCooSysSeq( xBCooSysCnt-getCoordinateSystems());
for( sal_Int32 nCSIdx=0; nCSIdxaCooSysSeq.getLength(); ++nCSIdx )
{
+
Reference chart2::XChartTypeContainer xCTCnt( aCooSysSeq[nCSIdx],
uno::UNO_QUERY );
if( ! xCTCnt.is())
continue;
+mnSeriesCount=0;
Sequence Reference chart2::XChartType aCTSeq(
xCTCnt-getChartTypes());
for( sal_Int32 nCTIdx=0; nCTIdxaCTSeq.getLength(); ++nCTIdx )
{
@@ -1689,10 +1692,10 @@ void ChartExport::exportSeries( Reference
chart2::XChartType xChartType, sal_
// TODO: idx and order
pFS-singleElement( FSNS( XML_c, XML_idx ),
-XML_val, I32S(nSeriesIdx),
+XML_val, I32S(mnSeriesCount),
FSEND );
pFS-singleElement( FSNS( XML_c, XML_order ),
-XML_val, I32S(nSeriesIdx),
+XML_val, I32S(mnSeriesCount++),
FSEND );
// export label
[Libreoffice-commits] core.git: 6 commits - sw/qa sw/source writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/Module_writerfilter.mk writerfilter/qa writerfilter/source
sw/qa/extras/rtfimport/data/cont-section-pagebreak.rtf | 16 +
sw/qa/extras/rtfimport/data/footer-para.rtf|5
sw/qa/extras/rtfimport/rtfimport.cxx | 42 ++
sw/source/core/unocore/unofield.cxx|2
writerfilter/CppunitTest_writerfilter_misc.mk | 36 ++
writerfilter/Module_writerfilter.mk|1
writerfilter/qa/cppunittests/misc/misc.cxx | 162 ++
writerfilter/source/dmapper/DomainMapper.cxx |4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 252 +++--
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 10
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 71 +++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3
12 files changed, 502 insertions(+), 102 deletions(-)
New commits:
commit e24ae38c8ef233e4b44840058e35959194724743
Author: Michael Stahl mst...@redhat.com
Date: Sun Mar 2 00:32:17 2014 +0100
fdo#47811: RTF import: fix Database field content
1. the Database field master does not have a Content property
2. SetFieldContent was called once for every chunk of text in the field
result, always overwriting the previous value; accumulate the text.
Change-Id: I63cfda19e2e416c52d100d9071796305a5d813c6
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index e01df18..8023f3d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2666,7 +2666,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_,
size_t len)
else if( m_pImpl-IsOpenField() m_pImpl-IsFieldResultAsString())
/*depending on the success of the field insert operation this
result will be
set at the field or directly inserted into the text*/
-m_pImpl-SetFieldResult( sText );
+m_pImpl-AppendFieldResult(sText);
else
{
if (pContext == 0)
@@ -2782,7 +2782,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
else if( m_pImpl-IsOpenField()
m_pImpl-IsFieldResultAsString())
/*depending on the success of the field insert operation this
result will be
set at the field or directly inserted into the text*/
-m_pImpl-SetFieldResult( sText );
+m_pImpl-AppendFieldResult(sText);
else
{
if (pContext == 0)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 43a0f3b..3ed405d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3331,7 +3331,6 @@ void DomainMapper_Impl::CloseFieldCommand()
// uno::makeAny( pContext-GetCommand().copy(
nIndex + 1 )));
uno::Reference text::XDependentTextField
xDependentField( xFieldInterface, uno::UNO_QUERY_THROW );
xDependentField-attachTextFieldMaster( xMaster );
-m_bSetUserFieldContent = true;
}
break;
case FIELD_MERGEREC : break;
@@ -3599,8 +3598,18 @@ bool DomainMapper_Impl::IsFieldResultAsString()
return bRet;
}
+void DomainMapper_Impl::AppendFieldResult(OUString const rString)
+{
+assert(!m_aFieldStack.empty());
+FieldContextPtr pContext = m_aFieldStack.top();
+SAL_WARN_IF(!pContext.get(), writerfilter.dmapper, no field context);
+if (pContext.get())
+{
+pContext-AppendResult(rString);
+}
+}
-void DomainMapper_Impl::SetFieldResult( OUString rResult )
+void DomainMapper_Impl::SetFieldResult(OUString const rResult)
{
#ifdef DEBUG_DOMAINMAPPER
dmapper_logger-startElement(setFieldResult);
@@ -3656,9 +3665,10 @@ void DomainMapper_Impl::SetFieldResult( OUString
rResult )
}
}
}
-catch( const uno::Exception )
+catch (const uno::Exception e)
{
-
+SAL_WARN(writerfilter.dmapper,
+DomainMapper_Impl::SetFieldResult: exception: e.Message);
}
}
}
@@ -3702,6 +3712,9 @@ void DomainMapper_Impl::PopFieldContext()
if( !pContext-IsCommandCompleted() )
CloseFieldCommand();
+if (!pContext-GetResult().isEmpty())
+SetFieldResult(pContext-GetResult());
+
//insert the field, TC or TOC
uno::Reference text::XTextAppend xTextAppend;
if (!m_aTextAppendStack.empty())
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 249f75c..ddd7775 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -124,6 +124,7 @@ class FieldContext
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/dbggui.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b6d03e9b555ae68cdf79038136773cca103b283d
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 3 14:14:45 2014 +0100
-Werror,-Wbool-conversion
Change-Id: Idd932fae23b313ea59f79a3159e9f4713e354b36
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index d13dc81..4ff4db9 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -419,7 +419,7 @@ DbgWindow::DbgWindow() :
maLstBox.SetPosPixel( Point( 0, 0 ) );
SetOutputSizePixel( Size( 600, 480 ) );
-if ( pData-aDbgWinState )
+if ( pData-aDbgWinState[0] )
{
OString aState( pData-aDbgWinState );
SetWindowState( aState );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cfe54a71bf2b856917bd490d311dad6fd599c619 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 3 13:20:45 2014 + Updated core Project: help a36b1693703d797899abba717525f2a058e78b58 diff --git a/helpcontent2 b/helpcontent2 index b789fc2..a36b169 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b789fc2c930c10d8a9ac60e7b92680fde990209c +Subproject commit a36b1693703d797899abba717525f2a058e78b58 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 14 -- source/text/schart/01/wiz_chart_type.xhp | 25 + 2 files changed, 13 insertions(+), 26 deletions(-) New commits: commit a36b1693703d797899abba717525f2a058e78b58 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 3 13:20:45 2014 + update helpids for chart type page .ui conversion Change-Id: I1aa0df7726282a8bdff3079546d048fbef6fe782 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 1c347d5..0ecf07f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2948,17 +2948,13 @@ HID_RPT_VERT_SCROLLBAR,64459, HID_RUBY_DIALOG,34187, HID_SCDLG_CONFLICTS,59023, HID_SCH_CHART_AUTO_FORMAT,63324, -HID_SCH_CTL_TYPE,63293, -HID_SCH_CTL_VARIANT,63294, HID_SCH_CT_INDICATE,63291, HID_SCH_DATA_SERIES_LABEL,63367, -HID_SCH_LB_BAR_GEOMETRY,63325, HID_SCH_LEGEND_POS_BOTTOM,63343, HID_SCH_LEGEND_POS_LEFT,63340, HID_SCH_LEGEND_POS_RIGHT,63342, HID_SCH_LEGEND_POS_TOP,63341, HID_SCH_LEGEND_SHOW,63366, -HID_SCH_NUM_OF_LINES,63323, HID_SCH_STATISTIK_BIGERROR,63349, HID_SCH_STATISTIK_BIGERROR_VALUE,63352, HID_SCH_STATISTIK_MEANVALUE,63344, @@ -5433,18 +5429,8 @@ basic_TabPage_RID_TP_GENERIC,602603520, basic_TabPage_RID_TP_MISC,602570752, basic_TabPage_RID_TP_PROFILE,602537984, basic_TimeField_RID_TP_MISC_SERVER_TIMEOUT,602579014, -chart2_CheckBox_TP_CHARTTYPE_CB_3D_LOOK,551781378, -chart2_CheckBox_TP_CHARTTYPE_CB_SPLINES,551781380, -chart2_CheckBox_TP_CHARTTYPE_CB_STACKED,551781379, -chart2_CheckBox_TP_CHARTTYPE_CB_XVALUE_SORTING,551781381, -chart2_CheckBox_TP_CHARTTYPE_CB_X_AXIS_CATEGORIES,551781377, chart2_FL_GRIDS_TP_WIZARD_TITLEANDOBJECTS,551813120, -chart2_ListBox_TP_CHARTTYPE_LB_3D_SCHEME,551783937, chart2_ListBox_TP_LOCATION_LB_TABLE,551833089, -chart2_PushButton_TP_CHARTTYPE_PB_SPLINE_DIALOG,551784961, -chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y,551780866, -chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867, -chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868, chart2_TabPage_TP_LAYOUT,551731200, chart2_TabPage_TP_LOCATION,551829504, chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120, diff --git a/source/text/schart/01/wiz_chart_type.xhp b/source/text/schart/01/wiz_chart_type.xhp index 78cd742..cee8d5a 100644 --- a/source/text/schart/01/wiz_chart_type.xhp +++ b/source/text/schart/01/wiz_chart_type.xhp @@ -33,6 +33,7 @@ body bookmark xml-lang=en-US branch=index id=bm_id4266792bookmark_valuecharts;choosing chart types/bookmark_value /bookmark +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ChartType/tp_ChartType id=bm_id863980 localize=false/ paragraph role=heading id=hd_id1536606 xml-lang=en-US level=1 l10n=NEWvariable id=wiz_chart_typelink href=text/schart/01/wiz_chart_type.xhpChart Wizard - Chart Type/link /variable/paragraph paragraph role=paragraph id=par_id6006958 xml-lang=en-US l10n=CHGOn the first page of the Chart Wizard you can link href=text/schart/01/choose_chart_type.xhpchoose a chart type/link./paragraph @@ -57,29 +58,29 @@ paragraph role=paragraph id=par_id8420056 xml-lang=en-US l10n=NEWClick emphCancel/emph to close the wizard without creating a chart./paragraphcomment63365 roadmap/comment bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_WIZARD_ROADMAP id=bm_id2511368 localize=false/ paragraph role=paragraph id=par_id2284920 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenClick to go to the named wizard page./ahelp/paragraphcomment63293 basic chart types/comment -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_CTL_TYPE id=bm_id8073976 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ChartType/charttype id=bm_id8073976 localize=false/ paragraph role=paragraph id=par_id3184301 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a basic chart type./ahelp/paragraphcomment63294 options/comment -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_CTL_VARIANT id=bm_id3088473 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ChartType/subtype id=bm_id3088473 localize=false/ paragraph role=paragraph id=par_id2129276 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a sub type of the basic chart type./ahelp/paragraphcomment551781378 3D look checkbox/comment -bookmark xml-lang=en-US branch=hid/chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK id=bm_id8226569 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ChartType/3dlook id=bm_id8226569 localize=false/ paragraph role=paragraph id=par_id9719229 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenEnables a 3D look for the data values./ahelp/paragraphcomment551783937 3D dropdown/comment -bookmark xml-lang=en-US branch=hid/chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME id=bm_id678731 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ChartType/3dscheme id=bm_id678731 localize=false/ paragraph role=paragraph id=par_id3860896 xml-lang=en-US l10n=NEWahelp
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2d0921d3939759cb64656ec2e5e3cfee9e56efcd
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 3 14:28:39 2014 +0100
writerfilter: oops, fix C++11 syntax
Change-Id: Iba5424260c4ef81292e5fc32745c808d93d48936
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3ed405d..25daf87 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2019,7 +2019,7 @@ static OUString lcl_ExtractToken(OUString const rCommand,
}
SAL_DLLPUBLIC_EXPORT // export just for test
-boost::tupleOUString, vectorOUString, vectorOUString
+boost::tupleOUString, vectorOUString, vectorOUString
lcl_SplitFieldCommand(const OUString rCommand)
{
OUString sType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/formulacell.hxx | 22 ---
sc/source/core/data/column.cxx | 109 ++--
sc/source/core/data/formulacell.cxx |6 +
sc/source/core/tool/compiler.cxx|4 -
sc/source/core/tool/token.cxx | 31 ++
5 files changed, 144 insertions(+), 28 deletions(-)
New commits:
commit cb83b334e489a4ec1cc067145c3f64b129475e7f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Feb 28 21:25:01 2014 -0500
fdo#75053: Adjust reference update on shift for formula groups.
This is similar to my earlier fix for reference update on moving of
cells.
Change-Id: I592599507bfcab12f611eeae7b56c99da6c31919
(cherry picked from commit f32df2d590d0ee14f09664934457ba9e8de8cbe6)
Reviewed-on: https://gerrit.libreoffice.org/8403
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 7e40ddd..7361b66 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -132,14 +132,6 @@ private:
};
voidInterpretTail( ScInterpretTailParameter );
-bool UpdatePosOnShift( const sc::RefUpdateContext rCxt );
-
-/**
- * Update reference in response to cell insertion or deletion.
- */
-bool UpdateReferenceOnShift(
-const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc, const
ScAddress* pUndoCellPos );
-
/**
* Update reference in response to cell copy-n-paste.
*/
@@ -213,6 +205,7 @@ public:
void ResetDirty();
bool NeedsListening() const;
void SetNeedsListening( bool bVar );
+void SetNeedsDirty( bool bVar );
void SetNeedNumberFormat( bool bVal );
short GetFormatType() const;
voidCompile(const OUString rFormula,
@@ -247,6 +240,19 @@ public:
const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc = NULL, const
ScAddress* pUndoCellPos = NULL );
/**
+ * Shift the position of formula cell as part of reference update.
+ *
+ * @return true if the position has shifted, false otherwise.
+ */
+bool UpdatePosOnShift( const sc::RefUpdateContext rCxt );
+
+/**
+ * Update reference in response to cell insertion or deletion.
+ */
+bool UpdateReferenceOnShift(
+const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc, const
ScAddress* pUndoCellPos );
+
+/**
* Update reference in response to cell move.
*/
bool UpdateReferenceOnMove(
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index db8cf96..e573def 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2428,6 +2428,68 @@ class UpdateRefOnNonCopy :
std::unary_functionFormulaGroup, void
ScDocument* mpUndoDoc;
bool mbUpdated;
+void updateRefOnShift( FormulaGroup rGroup )
+{
+if (!rGroup.mbShared)
+{
+ScAddress aUndoPos(mnCol, rGroup.mnRow, mnTab);
+mbUpdated |= rGroup.mpCell-UpdateReferenceOnShift(*mpCxt,
mpUndoDoc, aUndoPos);
+return;
+}
+
+// Update references of a formula group.
+ScFormulaCell** pp = rGroup.mpCells;
+ScFormulaCell** ppEnd = pp + rGroup.mnLength;
+ScFormulaCell* pTop = *pp;
+ScTokenArray* pCode = pTop-GetCode();
+boost::scoped_ptrScTokenArray pOldCode(pCode-Clone());
+ScAddress aOldPos = pTop-aPos;
+
+// Run this before the position gets updated.
+sc::RefUpdateResult aRes = pCode-AdjustReferenceOnShift(*mpCxt,
aOldPos);
+
+if (pTop-UpdatePosOnShift(*mpCxt))
+{
+// Update the positions of all formula cells.
+for (++pp; pp != ppEnd; ++pp) // skip the top cell.
+{
+ScFormulaCell* pFC = *pp;
+pFC-aPos.Move(mpCxt-mnColDelta, mpCxt-mnRowDelta,
mpCxt-mnTabDelta);
+}
+
+if (pCode-IsRecalcModeOnRefMove())
+aRes.mbValueChanged = true;
+}
+
+if (aRes.mbReferenceModified)
+{
+sc::StartListeningContext aStartCxt(mpCxt-mrDoc);
+sc::EndListeningContext aEndCxt(mpCxt-mrDoc, pOldCode.get());
+aEndCxt.setPositionDelta(
+ScAddress(-mpCxt-mnColDelta, -mpCxt-mnRowDelta,
-mpCxt-mnTabDelta));
+
+for (pp = rGroup.mpCells; pp != ppEnd; ++pp)
+{
+ScFormulaCell* p = *pp;
+p-EndListeningTo(aEndCxt);
+p-SetNeedsListening(true);
+}
+
+mbUpdated = true;
+
+fillUndoDoc(aOldPos, rGroup.mnLength, *pOldCode);
+}
+
+if (aRes.mbValueChanged)
+{
+for (pp = rGroup.mpCells; pp != ppEnd; ++pp)
+{
+ScFormulaCell* p = *pp;
+p-SetNeedsDirty(true);
+}
+}
+}
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc
solenv/inc/tg_compv.mk |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 2ae9c18c80c3bec0c52dc1b457ab667ced2172ee
Author: Herbert Dürr h...@apache.org
Date: Mon Mar 3 12:46:45 2014 +
#i124351# avoid clang: no input file build error messages
which were caused by the build system getting the compiler version
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index f8d7969..5585be8 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -35,9 +35,11 @@ CFLAGSVERSION=-dumpversion
CFLAGSVERSION_CMD=-dumpversion
CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f
$(SOLARENV)/bin/getcompver.awk
#CFLAGSNUMVERSION_CMD=-dumpversion | 21 $(AWK) -v num=true -f
$(SOLARENV)/bin/getcompver.awk
-.ENDIF
-
-.IF $(COM)==MSC
+.ELIF $(COM)==CLANG
+CFLAGSVERSION=--version
+CFLAGSVERSION_CMD=--version | head -n1 | sed -es/.*version // -es/ .*//
+CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -es/\.//
+.ELIF $(COM)==MSC
CFLAGSVERSION=
CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
CFLAGSNUMVERSION_CMD= $(PIPEERROR) $(AWK) -v num=true -f
$(SOLARENV)/bin/getcompver.awk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit d5d3927dedf1a7ff71753c5a90011dd6b3515671 Author: David Tardon dtar...@redhat.com Date: Mon Mar 3 15:29:27 2014 +0100 allow ext. projects to depend on mdds_headers Change-Id: Ie5b8576e12ef1b95b8ad8775379ec60041c6d816 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8476ae3..c23a879 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -111,10 +111,17 @@ endif ifneq ($(SYSTEM_MDDS),) +gb_ExternalProject__use_mdds_headers := + gb_LinkTarget__use_mdds_headers := else # !SYSTEM_MDDS +define gb_ExternalProject__use_mdds_headers +$(call gb_ExternalProject_use_external_project,$(1),mdds) + +endef + define gb_LinkTarget__use_mdds_headers $(call gb_LinkTarget_use_unpacked,$(1),mdds) $(call gb_LinkTarget_set_include,$(1),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'private/jmux/filter-bugzilla-branches'
New branch 'private/jmux/filter-bugzilla-branches' available with the following commits: commit eb2eb334dbfa75815f2ae4c61e29d8415b77fcc3 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Mon Mar 3 14:20:28 2014 + Filter branches for automatic bugzilla reports. Introduces a much stricter branch filter. Previously the script reported changes for all branches except aoo. Now it just reports changes for libreoffice-[^/]* and master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 11 --- source/text/shared/01/06040600.xhp | 54 +++-- 2 files changed, 22 insertions(+), 43 deletions(-) New commits: commit bf4bd6b7a918771621956a90f13213e8fc777507 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 3 14:47:33 2014 + update help ids for word completion page .ui conversion Change-Id: I838444f2488b3fe0e31b67731b405e81453508e3 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 0ecf07f..71736aa 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2491,7 +2491,6 @@ HID_NUM_TOOLBOX,54836, HID_OFACTL_AUTOCORR_REPLACE,35032, HID_OFADLG_OPTIONS_TREE,35097, HID_OFADLG_TREELISTBOX,35098, -HID_OFAPAGE_AUTOCOMPLETE_OPTIONS,35141, HID_OFAPAGE_AUTOCORR_OPTIONS,35029, HID_OFAPAGE_AUTOFORMAT_CLB,35075, HID_OFAPAGE_SMARTTAG_OPTIONS,35155, @@ -6062,11 +6061,6 @@ svx_CheckBox_OFA_TP_VIEW_CB_SELECTION,810517575, svx_CheckBox_OFA_TP_VIEW_CB_SYSTEM_FONT,810517561, svx_CheckBox_OFA_TP_VIEW_CB_USE_ANTIALIASE,810517573, svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL,810517572, -svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_ACTIV,809157753, -svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_APPEND_SPACE,809157755, -svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_AS_TIP,809157757, -svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_COLLECT,809157754, -svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_REMOVE_LIST,809157756, svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709, @@ -6246,7 +6240,6 @@ svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE,810520120, svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105, svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE,810520098, svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095, -svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_REPLACE,1368919575, @@ -6383,14 +6376,11 @@ svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530, svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719, svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925, svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761, -svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES,809159812, svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761, svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874, svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT,1598216200, svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINWIDTH,1598216202, svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT,810522688, -svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES,809162881, -svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880, svx_NumericField_RID_SVXFLOAT_3D_NUM_HORIZONTAL,3388495897, svx_NumericField_RID_SVXFLOAT_3D_NUM_VERTICAL,3388495899, svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_1,701569025, @@ -6412,7 +6402,6 @@ svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_EDIT,1241813510, svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RENAME,1241813511, svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_RUN,1241813507, svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK,1345966596, -svx_PushButton_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_PB_ENTRIES,809161349, svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821, svx_PushButton_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS,809259743, svx_PushButton_RID_SFXPAGE_PATH_BTN_PATH,733581837, diff --git a/source/text/shared/01/06040600.xhp b/source/text/shared/01/06040600.xhp index 22a073e..9fb2c22 100644 --- a/source/text/shared/01/06040600.xhp +++ b/source/text/shared/01/06040600.xhp @@ -39,59 +39,49 @@ case select=WRITERembed href=text/swriter/guide/word_completion.xhp#word_completion/ /case /switch -!-- removed HID OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV -- -bookmark xml-lang=en-US branch=hid/cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV id=bm_id4897915 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/wordcompletionpage/WordCompletionPage id=bm_id4897916 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/wordcompletionpage/enablewordcomplete id=bm_id4897915 localize=false/ paragraph xml-lang=en-US id=hd_id3154514 role=heading level=2 l10n=U oldref=94Enable word completion/paragraph - paragraph xml-lang=en-US id=par_id3156153 role=paragraph l10n=U oldref=95ahelp hid=OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIVStores frequently used words, and automatically completes a word after you type three letters that match the first three letters of a stored word./ahelp/paragraph -!-- removed HID
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 806899191f450079457fcea3046fb131f8aeb81d Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 3 14:47:33 2014 + Updated core Project: help bf4bd6b7a918771621956a90f13213e8fc777507 diff --git a/helpcontent2 b/helpcontent2 index a36b169..bf4bd6b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a36b1693703d797899abba717525f2a058e78b58 +Subproject commit bf4bd6b7a918771621956a90f13213e8fc777507 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source
cui/UIConfig_cui.mk|1
cui/source/inc/autocdlg.hxx| 46 +-
cui/source/inc/cuires.hrc |3
cui/source/inc/helpid.hrc |1
cui/source/tabpages/autocdlg.cxx | 164 +-
cui/source/tabpages/autocdlg.src | 134
cui/uiconfig/ui/autocorrectdialog.ui |4
cui/uiconfig/ui/wordcompletionpage.ui | 391 +
extras/source/glade/libreoffice-catalog.xml.in |3
9 files changed, 513 insertions(+), 234 deletions(-)
New commits:
commit 7bb7f9e01803249d0b29bd75dfcb29c719dc99c9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 3 14:04:10 2014 +
convert word completion page to .ui format
Change-Id: I4f60b5530428ad39bf7e9bea58b09d4228e11bb3
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 6ebab43..4991972 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -168,6 +168,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/transparencytabpage \
cui/uiconfig/ui/twolinespage \
+ cui/uiconfig/ui/wordcompletionpage \
cui/uiconfig/ui/zoomdialog \
))
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 943ad09..ab5a31c 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -399,36 +399,36 @@ public:
class OfaAutoCompleteTabPage : public SfxTabPage
{
-using TabPage::ActivatePage;
-
+public:
class AutoCompleteMultiListBox : public MultiListBox
{
-OfaAutoCompleteTabPage rPage;
+OfaAutoCompleteTabPage* m_pPage;
public:
-AutoCompleteMultiListBox( OfaAutoCompleteTabPage rPg,
-const ResId rResId )
-: MultiListBox( rPg, rResId ), rPage( rPg ) {}
-
+AutoCompleteMultiListBox(Window *pParent, WinBits nBits)
+: MultiListBox(pParent, nBits)
+, m_pPage(NULL)
+{
+}
+void SetPage(OfaAutoCompleteTabPage *pPage) { m_pPage = pPage; }
virtual bool PreNotify( NotifyEvent rNEvt );
};
-CheckBoxaCBActiv; ///Enable word completion
-CheckBoxaCBAppendSpace;///Append space
-CheckBoxaCBAsTip; ///Show as tip
-
-CheckBoxaCBCollect;///Collect words
-CheckBoxaCBRemoveList;///...save the list for later use...
-
-FixedText aFTExpandKey;
-ListBox aDCBExpandKey;
-FixedText aFTMinWordlen;
-NumericFieldaNFMinWordlen;
-FixedText aFTMaxEntries;
-NumericFieldaNFMaxEntries;
-AutoCompleteMultiListBoxaLBEntries;
-PushButton aPBEntries;
+private:
+using TabPage::ActivatePage;
+CheckBox* m_pCBActiv; ///Enable word completion
+CheckBox* m_pCBAppendSpace;///Append space
+CheckBox* m_pCBAsTip; ///Show as tip
+
+CheckBox* m_pCBCollect;///Collect words
+CheckBox* m_pCBRemoveList;///...save the list for later use...
+
+ListBox*m_pDCBExpandKey;
+NumericField* m_pNFMinWordlen;
+NumericField* m_pNFMaxEntries;
+AutoCompleteMultiListBox* m_pLBEntries;
+PushButton* m_pPBEntries;
editeng::SortedAutoCompleteStrings* m_pAutoCompleteList;
-sal_uInt16 nAutoCmpltListCnt;
+sal_uInt16 m_nAutoCmpltListCnt;
DECL_LINK( CheckHdl, CheckBox* );
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index ab879cf..3d598e2 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -95,9 +95,6 @@
#define RID_SVXSTR_CHARNAME_STYLE (RID_SVX_START + 242)
#define RID_SVXSTR_CHARNAME_TYPEFACE(RID_SVX_START + 243)
-// autocor
-#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
-
// options
#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START +
1162)
#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 2f11a84..0180f13 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -197,7 +197,6 @@
#define HID_TPCOLOR_CMYK_1 CUI_HID_TPCOLOR_CMYK_1
#define HID_TPCOLOR_CMYK_2 CUI_HID_TPCOLOR_CMYK_2
#define HID_TPCOLOR_CMYK_3 CUI_HID_TPCOLOR_CMYK_3
-#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS
#define HID_MEASURE_CTL_POSITION CUI_HID_MEASURE_CTL_POSITION
#define HID_VALUESET_NUM CUI_HID_VALUESET_NUM
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 85f6223..3861044 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2082,26 +2082,38 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl(
sal_UCS4 cChar )
return aOUStr;
}
-OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2a/e9c18c80c3bec0c52dc1b457ab667ced2172ee
2a/e9c18c80c3bec0c52dc1b457ab667ced2172ee |1 + 1 file changed, 1 insertion(+) New commits: commit c4c8afde8ae7ef86b7d67653234ec6a5b1e01af3 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 3 14:57:09 2014 + Notes added by 'git notes add' diff --git a/2a/e9c18c80c3bec0c52dc1b457ab667ced2172ee b/2a/e9c18c80c3bec0c52dc1b457ab667ced2172ee new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/2a/e9c18c80c3bec0c52dc1b457ab667ced2172ee @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/tp_ChartType.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit d1478f42c7cc50313cbff3f171e4fea1ff99f77d
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 3 16:07:35 2014 +0100
-Werror,-Wunused-function
Change-Id: Ief9b2179db2e6c05dbf6e076e147a0a8adbccc04
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 610b5a2..63df637 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -38,11 +38,6 @@ using namespace ::com::sun::star::chart2;
namespace
{
-long lcl_getDistance()
-{
-return 6;
-}
-
sal_Bool lcl_getSortByXValues( const uno::Reference
chart2::XChartDocument xChartDoc )
{
sal_Bool bRet = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dlgctrl.cxx | 63 ++
1 file changed, 28 insertions(+), 35 deletions(-)
New commits:
commit 0a4f02575f9dfbd6e5706bd025093d110ed97f65
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Mar 2 17:57:57 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/dlgctrl.cxx
Change-Id: Ibfae3f4d94f675db0275e83f8d5f074269713cad
Reviewed-on: https://gerrit.libreoffice.org/8427
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 5bc9c92..531581f 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -86,11 +86,10 @@ static Window* ImplGetSubChildWindow( Window* pParent,
sal_uInt16 n, sal_uInt16
{
pWindow = pWindow-ImplGetWindow();
-// Unsichtbare und disablte Fenster werden uebersprungen
+// skip invisible and disabled windows
if ( pTabPage || isVisibleInLayout(pWindow) )
{
-// Wenn das letzte Control ein TabControl war, wird von
-// diesem die TabPage genommen
+// if the last control was a TabControl, take its TabPage
if ( pTabPage )
{
pFoundWindow = ImplGetSubChildWindow( pTabPage, n, nIndex );
@@ -100,17 +99,13 @@ static Window* ImplGetSubChildWindow( Window* pParent,
sal_uInt16 n, sal_uInt16
{
pFoundWindow = pWindow;
-// Bei einem TabControl sich die aktuelle TabPage merken,
-// damit diese dann genommen wird
+// for a TabControl, remember the current TabPage for later use
if ( pWindow-GetType() == WINDOW_TABCONTROL )
{
TabControl* pTabControl = ((TabControl*)pWindow);
-// Feststellen, ob TabPage Child vom TabControl ist
-// und auch noch existiert (deshalb durch Vergleich,
-// indem alle ChildFenster getestet werden). Denn es
-// kann sein, das TabPages schon in einem Dialog-Dtor
-// zerstoert wurden, obwohl das TabControl noch
-// existiert.
+// Check if the TabPage is a Child of the TabControl and
still exists (by
+// walking all child windows); because it could be that
the TabPage has been
+// destroyed already by a Dialog-Dtor, event that the
TabControl still exists.
TabPage* pTempTabPage = pTabControl-GetTabPage(
pTabControl-GetCurPageId() );
if ( pTempTabPage )
{
@@ -249,7 +244,7 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex,
sal_uInt16 nType,
if ( i = nFormEnd )
{
-// 2ten Index mitfuehren, falls alle Controls disablte
+// carry the 2nd index, in case all controls are disabled
sal_uInt16 nStartIndex2 = i;
sal_uInt16 nOldIndex = i+1;
@@ -316,7 +311,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
sal_uInt16 nSecondFormStart = 0;
sal_uInt16 nFormEnd;
-// Focus-Fenster in der Child-Liste suchen
+// find focus window in the child list
Window* pFirstChildWindow = pSWindow = ImplGetChildWindow( pParent, 0, i,
false );
if( pWindow == NULL )
@@ -329,8 +324,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
pSWindow-ImplGetWindow()-IsDialogControlStart() )
nFormStart = i;
-// SecondWindow wegen zusammengesetzten Controls wie
-// ComboBoxen und Feldern
+// SecondWindow for composit controls like ComboBoxes and arrays
if ( pSWindow-ImplIsWindowOrChild( pWindow ) )
{
pSecondWindow = pSWindow;
@@ -347,8 +341,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
if ( !pSWindow )
{
-// Fenster nicht gefunden, dann koennen wir auch keine
-// Steuerung uebernehmen
+// Window not found; we cannot handle it
if ( !pSecondWindow )
return NULL;
else
@@ -359,11 +352,11 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent,
Window* pWindow, sal_uInt
}
}
-// Start-Daten setzen
+// initialize
rIndex = i;
rFormStart = nFormStart;
-// Formularende suchen
+// find end of template
nFormEnd = nFormStart;
pTempWindow = pSWindow;
sal_Int32 nIteration = 0;
@@ -445,7 +438,7 @@ static Window* ImplFindAccelWindow( Window* pParent,
sal_uInt16 rIndex, sal_Uni
return pMnemonicWidget;
}
-// Bei Static-Controls auf das naechste Controlm weiterschalten
+
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 19 +-
1 file changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 7963d2b0f6fe006c215607eda1c51acf1d7273b5
Author: Vort vv...@yandex.ru
Date: Sun Mar 2 13:01:05 2014 +0200
fdo#40513 PDF Import: Hack: Replace incorrect values of font's ascent
property
Change-Id: Ib7bd6e15fff5213b5d935c6f03f2c65ea3f6ca50
Reviewed-on: https://gerrit.libreoffice.org/8416
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 391f755..c5b145f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -792,12 +792,29 @@ void PDFOutDev::drawChar(GfxState *state, double x,
double y,
if( u == NULL )
return;
+GfxFont* font = state-getFont();
+double ascent = font-getAscent();
+GooString* fontName = font-getName();
+
+// Hackfix until incorrect ascent values are fixed in poppler (fdo#75667)
+if ((fontName-cmpN(Arial, 5) == 0)
+(ascent 0.717) (ascent 0.719))
+{
+ascent = 0.905;
+}
+else if ((fontName-cmpN(Times New Roman, 15) == 0)
+(ascent 0.682) (ascent 0.684))
+{
+ascent = 0.891;
+}
+
// normalize coordinates: correct from baseline-relative to upper
// left corner of glyphs
double x2(0.0), y2(0.0);
state-textTransformDelta( 0.0,
- state-getFont()-getAscent(),
+ ascent,
x2, y2 );
+
const double fFontSize(state-getFontSize());
x += x2*fFontSize;
y += y2*fFontSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac RepositoryExternal.mk sfx2/source
RepositoryExternal.mk | 10 --
config_host.mk.in |1 +
configure.ac |2 +-
sfx2/source/appl/childwin.cxx |4
sfx2/source/appl/workwin.cxx |8
sfx2/source/control/ctrlitem.cxx | 14 --
sfx2/source/control/objface.cxx|4
sfx2/source/control/shell.cxx |3 ---
sfx2/source/control/statcach.cxx |6 --
sfx2/source/doc/docfac.cxx |2 --
sfx2/source/doc/frmdescr.cxx |2 --
sfx2/source/doc/objmisc.cxx|2 --
sfx2/source/doc/objserv.cxx|3 ---
sfx2/source/doc/objstor.cxx|1 -
sfx2/source/doc/objxtor.cxx|4
sfx2/source/doc/sfxbasemodel.cxx |2 --
sfx2/source/menu/virtmenu.cxx | 12
sfx2/source/view/sfxbasecontroller.cxx |2 --
sfx2/source/view/viewfac.cxx |2 --
sfx2/source/view/viewfrm.cxx | 11 ---
sfx2/source/view/viewfrm2.cxx |1 -
sfx2/source/view/viewsh.cxx| 11 ---
22 files changed, 10 insertions(+), 97 deletions(-)
New commits:
commit 93aff251a3f7f648d532c3818f0419d43958ab64
Author: David Tardon dtar...@redhat.com
Date: Mon Mar 3 16:23:27 2014 +0100
set MDDS_CFLAGS in configure
Change-Id: Ib6be67c7a23e5b403e90f4f72578f7385e895f23
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c23a879..463db2b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -113,7 +113,13 @@ ifneq ($(SYSTEM_MDDS),)
gb_ExternalProject__use_mdds_headers :=
-gb_LinkTarget__use_mdds_headers :=
+define gb_LinkTarget__use_mdds_headers
+$(call gb_LinkTarget_set_include,$(1),\
+ $(MDDS_CFLAGS) \
+ $$(INCLUDE) \
+)
+
+endef
else # !SYSTEM_MDDS
@@ -125,7 +131,7 @@ endef
define gb_LinkTarget__use_mdds_headers
$(call gb_LinkTarget_use_unpacked,$(1),mdds)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,mdds/include) \
+ $(MDDS_CFLAGS) \
$$(INCLUDE) \
)
diff --git a/config_host.mk.in b/config_host.mk.in
index 2603678..4477ebc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -369,6 +369,7 @@ export LIBMARIADB=@LIBMARIADB@
export LIBMARIADB_PATH=@LIBMARIADB_PATH@
export BUNDLE_MARIADB=@BUNDLE_MARIADB@
export MD5SUM=@MD5SUM@
+export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
export MERGELIBS=@MERGELIBS@
export MINGWCXX=@MINGWCXX@
diff --git a/configure.ac b/configure.ac
index 59919d7..e2198dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8590,7 +8590,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===
dnl Check for system mdds
dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.2])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.2],
[-I${WORKDIR}/UnpackedTarball/mdds/include])
dnl ===
dnl Determine which hash container mdds shall use
commit 7ac4babfd6eabc51262560a5caa846d86f79a6c0
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Sun Mar 2 16:06:40 2014 +0100
SFX2 : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Change-Id: I35a9403da152ea2b637c0235d776c7789e2ef207
Reviewed-on: https://gerrit.libreoffice.org/8420
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 74c7534..9058a84 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -161,7 +161,6 @@ SfxChildWindow::SfxChildWindow(Window *pParentWindow,
sal_uInt16 nId)
pImp-pWorkWin = NULL;
pContext = 0L;
-DBG_CTOR(SfxChildWindow,0);
}
void SfxChildWindow::Destroy()
@@ -188,7 +187,6 @@ void SfxChildWindow::Destroy()
SfxChildWindow::~SfxChildWindow()
{
-DBG_DTOR(SfxChildWindow,0);
delete pContext;
delete pWindow;
delete pImp;
@@ -311,7 +309,6 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo
rInfo)
void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign)
{
-DBG_CHKTHIS(SfxChildWindow,0);
eChildAlignment = eAlign;
}
@@ -319,7 +316,6 @@ void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign)
SfxChildWinInfo SfxChildWindow::GetInfo() const
{
-DBG_CHKTHIS(SfxChildWindow,0);
SfxChildWinInfo aInfo(pImp-pFact-aInfo);
aInfo.aPos = pWindow-GetPosPixel();
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index fbba20c..e50be8e 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -607,7 +607,6 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings
rB,
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/splitwin.cxx | 117 +++--
vcl/source/window/syschild.cxx | 13 ++--
vcl/source/window/tabdlg.cxx | 14 ++--
3 files changed, 70 insertions(+), 74 deletions(-)
New commits:
commit 7f3b87965e6d754b10c74871a4fe76485bcc6cfe
Author: Luc Castermans luc.casterm...@gmail.com
Date: Sun Mar 2 11:28:25 2014 +0100
Translated German comments - find-german-comments clean now
Conflicts:
vcl/source/window/seleng.cxx
Change-Id: Ie7733c9bdb5813ef4efb4bbb95223a6d683f9945
Reviewed-on: https://gerrit.libreoffice.org/8409
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 67a3714..cabfb25 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -430,7 +430,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
ImplSplitItem* pItems = pSet-mpItems;
boolbEmpty;
-// Anzahl sichtbarer Items ermitteln
+// get number of visible items
nVisItems = 0;
for ( i = 0; i nItems; i++ )
{
@@ -438,7 +438,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
nVisItems++;
}
-// Groessen berechnen
+// calculate sizes
if ( bRows )
nCalcSize = nSetHeight;
else
@@ -464,7 +464,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
nAbsSize += pItems[i].mnSize;
}
}
-// Relative-Werte auf prozentual mappen (Percent bei uns 10tel Prozent)
+// map relative values to percentages (percentage here one tenth of a
procent)
nPercent *= nPercentFactor;
if ( nRelCount )
{
@@ -511,7 +511,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
pSet-mbCalcPix = false;
pSet-mnLastSize = nCalcSize;
-// Fenster einpassen
+// adapt window
nSizeDelta = nCalcSize-nCurSize;
if ( nSizeDelta )
{
@@ -519,7 +519,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
nSizeWinSize= 0;
nNewSizeWinSize = 0;
-// Zuerst die absoluten Items relativ resizen
+// first resize absolute items relative
for ( i = 0; i nItems; i++ )
{
if ( !(pItems[i].mnBits SWIB_INVISIBLE) )
@@ -531,7 +531,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
}
}
}
-// Rundungsfehler werden hier nicht ausgelichen
+// do not compensate rounding errors here
if ( (nAbsItems (sal_uInt16)(std::abs( nSizeDelta )))
nSizeWinSize )
{
for ( i = 0; i nItems; i++ )
@@ -548,12 +548,12 @@ static void ImplCalcSet( ImplSplitSet* pSet,
nSizeDelta -= nNewSizeWinSize-nSizeWinSize;
}
-// Jetzt die Rundunsfehler ausgleichen
+// compensate rounding errors now
j = 0;
nMins = 0;
while ( nSizeDelta (nItems != nMins) )
{
-// Feststellen, welche Items berechnet werden duerfen
+// determinne which items we can calculate
nCalcItems = 0;
while ( !nCalcItems )
{
@@ -587,7 +587,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
j++;
}
-// Groessen von den einzelnen Items abziehen
+// substract size of individual items
nErrorSum = nSizeDelta % nCalcItems;
nCurSizeDelta = nSizeDelta / nCalcItems;
nMins = 0;
@@ -644,7 +644,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
}
}
-// Maximale Groesse berechnen
+// calculate maximum size
if ( bRows )
{
nPos = nSetTop;
@@ -662,7 +662,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
nMaxPos = nSetLeft+nSetWidth;
}
-// Fenster anordnen und Werte anpassen
+// order windows and adept values
for ( i = 0; i nItems; i++ )
{
pItems[i].mnOldSplitPos= pItems[i].mnSplitPos;
@@ -740,7 +740,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
}
}
-// Sub-Set's berechnen
+// calculate Sub-Set's
for ( i = 0; i nItems; i++ )
{
if ( pItems[i].mpSet pItems[i].mnWidth pItems[i].mnHeight )
@@ -752,7 +752,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
}
}
-// Fixed setzen
+// set fixed
for ( i = 0; i nItems; i++ )
{
pItems[i].mbFixed = false;
@@ -760,8 +760,8 @@ static void ImplCalcSet( ImplSplitSet* pSet,
pItems[i].mbFixed = true;
else
{
-// Wenn Child-Set vorhanden, ist dieses Item auch Fixed, wenn
-// ein Child fixed ist
+//
Introduction + New Idea for GSoc 2014
Hi.. I'm Lakmal Muthugama a Computer Science and Engineering student from University of Moratuwa, Sri Lanka. I would like to participate for Google Summer of Code this year under a project in LibreOffice. Before I work under any of the projects in the given list I would like to suggest an idea. I did some experimental code on the topic also. Adding computational power to LibreOffice using existing mathematical engines... I experimented a LibreOffice plugin using python to access Wolfram web services to get solutions for the equations that we're typing. My suggestion to have a similar plugin to get the service from Sympy Live . It is possible since it uses Json calls. 1. This will be helpful for those who are building mathematical tutorials etc. 2. Can use to add more functions to calc etc. (Integration, differentiation etc.) An adapter can be written between libremath expressions and sympy expressions. Could you please tell me the possibility of continuing with the idea. Thanks Regards Lakmal -- *Lakmal Muthugama,* *Undergraduate,* *Department of Computer Science and Engineering,* *University of Moratuwa,* *Sri Lanka.* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac
config_host.mk.in |1 -
configure.ac | 13 -
2 files changed, 14 deletions(-)
New commits:
commit ab587570a2aac453cc1259379221668b94775e69
Author: David Tardon dtar...@redhat.com
Date: Mon Mar 3 16:50:11 2014 +0100
drop unused configure test
Change-Id: If079720cec600a2a8c5acf1c3a4fa752d288b36e
diff --git a/config_host.mk.in b/config_host.mk.in
index 4477ebc..2bf9dd4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -370,7 +370,6 @@ export LIBMARIADB_PATH=@LIBMARIADB_PATH@
export BUNDLE_MARIADB=@BUNDLE_MARIADB@
export MD5SUM=@MD5SUM@
export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
-export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
export MERGELIBS=@MERGELIBS@
export MINGWCXX=@MINGWCXX@
export MINGWSTRIP=@MINGWSTRIP@
diff --git a/configure.ac b/configure.ac
index e2198dc..0149b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8593,19 +8593,6 @@ dnl
===
libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.2],
[-I${WORKDIR}/UnpackedTarball/mdds/include])
dnl ===
-dnl Determine which hash container mdds shall use
-dnl ===
-AC_MSG_CHECKING([which hash container mdds shall use])
-if test x$HAVE_CXX11 = xTRUE -a x$SYSTEM_MDDS = xTRUE; then
-MDDS_CPPFLAGS=$CXXFLAGS_CXX11
-AC_MSG_RESULT([std::unordered_map])
-else
-MDDS_CPPFLAGS=-DMDDS_HASH_CONTAINER_BOOST
-AC_MSG_RESULT([boost::unordered_map])
-fi
-AC_SUBST([MDDS_CPPFLAGS])
-
-dnl ===
dnl Check for system glm
dnl ===
AC_MSG_CHECKING([which glm to use])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unmet Dependencies Ubuntu 13.10
Hey Bjoern Anurag,
'libboost1.54-dev (= 1.39)' should be in 13.10 (saucy):
https://launchpad.net/ubuntu/saucy/+package/libboost1.54-dev
So you'll have to find out why apt thinks its a a bad idea to install it ('but
it is not going to be installed'). To find out more, one easy step would be to:
apt-get install libboost1.54-dev
and see what is being complained about (And possibly repeat that with more 'but
it is not going to be installed's until you find the root problem).
Thanks! Moggi actually hinted that I needed to install libboost all or
something like that and it ended up working. Was strange that I couldn't
just do apt-get build-dep as that always has worked but we're good to go
- I have a build :)
Best,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfcontrolwords.hxx |1 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 8899b47d2252fd1c2f58ba30558c4ec41d65e442
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 3 17:02:27 2014 +0100
-Werror,-Wtautological-constant-out-of-range-compare
(If the underlying type of an unscoped enumeration is unfixed, it need not
be
signed.)
Change-Id: I26a406504863512a0d3861ad8b28523b0a6dccaa
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx
b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index a29b86d..d38a0b4 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -15,6 +15,7 @@ namespace rtftok {
enum RTFKeyword
{
+RTF_invalid = -1,
RTF_HEXCHAR,
RTF_OPTHYPH,
RTF_IGNORE,
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7464202..712690d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -280,7 +280,7 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
m_aHexBuffer(),
m_bMathNor(false),
m_bIgnoreNextContSectBreak(false),
-m_nResetBreakOnSectBreak(static_castRTFKeyword(-1)),
+m_nResetBreakOnSectBreak(RTF_invalid),
m_bNeedSect(false), // done by checkFirstRun
m_bWasInFrame(false),
m_bHadPicture(false),
@@ -1981,10 +1981,10 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
else
{
sectBreak();
-if (m_nResetBreakOnSectBreak != -1)
+if (m_nResetBreakOnSectBreak != RTF_invalid)
{ // this should run on _second_ \sect after \page
dispatchSymbol(m_nResetBreakOnSectBreak); // lazy reset
-m_nResetBreakOnSectBreak = static_castRTFKeyword(-1);
+m_nResetBreakOnSectBreak = RTF_invalid;
m_bNeedSect = false; // dispatchSymbol set it
}
}
@@ -2349,7 +2349,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
}
if (nParam = 0)
{
-if (m_nResetBreakOnSectBreak != -1)
+if (m_nResetBreakOnSectBreak != RTF_invalid)
{
m_nResetBreakOnSectBreak = nKeyword;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Metabug for Form Controls and docx export
As far as i see, LibreOffice still cannot export form control fields to a docx file, while it can export to doc format. There are some bug reports pointing specific form controls, like checkbox is missing when saving docx, text field is missing etc. LibreOffice cannot save any variations in current controls in docx :(. I made a sample file, no luck for any type of form control to save as docx. Form controls are very important in corporate usage, and such problem has a high priority for such users. And such bugs can really affect LO brand. Should we fill a meta bug for this issue? My experience is that devs don't find this to be incredibly helpful - let's see what they think on this as the point of meta bugs are to help developers fix things :) Best, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/cont-section-pagebreak.rtf | 16 +++
sw/qa/extras/rtfimport/data/footer-para.rtf|5 +
sw/qa/extras/rtfimport/rtfimport.cxx | 42 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 71 +++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3
5 files changed, 116 insertions(+), 21 deletions(-)
New commits:
commit 153993292cc9f11fed8fcba8de45b0c46d5e0ef2
Author: Michael Stahl mst...@redhat.com
Date: Thu Feb 27 23:48:59 2014 +0100
RTF import: fix spurious page breaks at doc end (related: rhbz#1065629)
When a document ends with \sect it's possible that a spurious page break
is created. In fact the spurious page break is always created by the
RTF importer, sometimes it is deleted again by
DomainMapper_Impl::RemoveLastParagraph() and sometimes not.
It is created because on the final \sect RTFDocumentImpl::sectBreak()
still calls startSectionGroup(), and the popState() for the \rtf1 group
then calls sectBreak() another time.
To prevent this, do not call startSectionGroup() from sectBreak() but
instead from setNeedSect(), and ensure that it is called as soon as
anything after \sect is read.
One unit test fails because the \page is not handled properly: the
conversion to \skbpage \sect \skbnone is not correct, because the \skb*
keywords are an exception and affect the \sect that precedes them, not
the following one; sending the \skbpage later unfortunately requires
additional cleanup later.
(cherry picked from commit e3f254ab8211fbab7541cde2100a35c875b0c240)
RTF import: add unit test for page break in continuous section
(cherry picked from commit f03218f43e8c25c2e136d364455f3cdaf95362b6)
RTF import: fix paragraphs in header/footer
(cherry picked from commit 74b3f4f00766d199df3b017d056cf7a00ae52988)
Change-Id: I3c1a3bceb2c8b75bbecdc748170562451ce5f5c3
Reviewed-on: https://gerrit.libreoffice.org/8439
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/rtfimport/data/cont-section-pagebreak.rtf
b/sw/qa/extras/rtfimport/data/cont-section-pagebreak.rtf
new file mode 100644
index 000..888dc2d
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/cont-section-pagebreak.rtf
@@ -0,0 +1,16 @@
+{\rtf1 \ansi
+\fet0 \ftnbj \paperw11905 \paperh16837 \margt2267 \margb1133 \margl1417
\margr1417
+
+\sectd
+\sbknone
+FIRST
+\par
+\sect
+SECOND
+\par
+\page
+\sect
+THIRD
+\par
+\sect
+}
diff --git a/sw/qa/extras/rtfimport/data/footer-para.rtf
b/sw/qa/extras/rtfimport/data/footer-para.rtf
new file mode 100644
index 000..28863b2
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/footer-para.rtf
@@ -0,0 +1,5 @@
+{\rtf1\fbidis\ansi\ansicpg0\uc0\deff0\deflang0\deflangfe0\paperw11905\paperh16838\margl1200\margr1200\margt1200\margb1200\headery600\footery600\viewscale100\viewzk0\titlepg
+{\fonttbl{\f0\fnil Arial;}}
+{\footerf
+\pard\s0\fi0\li0\qc\ri0\sb0\sa0\itap0 \plain \f0\fs18 All Rights Reserved.\par}
+\pard\par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 9504027..73bf749 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -17,6 +17,7 @@
#include com/sun/star/drawing/LineStyle.hpp
#include com/sun/star/graphic/GraphicType.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/style/BreakType.hpp
#include com/sun/star/style/CaseMap.hpp
#include com/sun/star/style/LineSpacing.hpp
#include com/sun/star/style/LineSpacingMode.hpp
@@ -1413,6 +1414,47 @@ DECLARE_RTFIMPORT_TEST(testNestedTable,
rhbz1065629.rtf)
getPropertytable::BorderLine2(xCell, RightBorder));
CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0x),
getPropertysal_Int32(xCell, BackColor));
+
+// \sect at the end resulted in spurious page break
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
+DECLARE_RTFIMPORT_TEST(testContSectionPageBreak, cont-section-pagebreak.rtf)
+{
+uno::Referencetext::XTextRange xParaSecond = getParagraph(2);
+CPPUNIT_ASSERT_EQUAL(OUString(SECOND), xParaSecond-getString());
+CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE,
+getPropertystyle::BreakType(xParaSecond, BreakType));
+CPPUNIT_ASSERT_EQUAL(OUString(),
+getPropertyOUString(xParaSecond, PageDescName));
+// actually not sure how many paragraph there should be between
+// SECOND and THIRD - important is that the page break is on there
+uno::Referencetext::XTextRange xParaNext = getParagraph(3);
+CPPUNIT_ASSERT_EQUAL(OUString(), xParaNext-getString());
+CPPUNIT_ASSERT_EQUAL(OUString(Converted1),
+getPropertyOUString(xParaNext, PageDescName));
+uno::Referencetext::XTextRange xParaThird = getParagraph(4);
+CPPUNIT_ASSERT_EQUAL(OUString(THIRD),
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/README |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit ec39578e5cb4b7e81bf5c539c248966d609c7257 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Mar 3 17:33:30 2014 +0100 sw/qa: clean up xray instructions Change-Id: I34ed7b81a838a2c994bb028e92f463d7b08f242f diff --git a/sw/qa/extras/README b/sw/qa/extras/README index b2c003f..8759dab 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -65,10 +65,7 @@ enough if you want to test a paragraph or character property. Figuring out the UNO API just by reading the idl files under `offapi/` is not that productive. Xray can help in this case. Download it from: -http://bernard.marcelly.perso.sfr.fr/index2.html - -(Mirror in case a new version behaves in a strange way: -http://people.freedesktop.org/~vmiklos/2013/XrayTool52_en.sxw) +http://dev-www.libreoffice.org/extern/XrayTool52_en.sxw It's an SXW file, start Writer, Tools - Options - LibreOffice - Security, Macro Security, and there choose Low. Then open the SXW, and click `Install ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +
sfx2/source/doc/objstor.cxx|6 --
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 0035b3218d8652652e62afe89eddfd28a9021b75
Author: christianju christianjun...@gmail.com
Date: Mon Feb 10 02:30:48 2014 +0100
fdo#61320: Allow user to choose whether to create thumbnails inside odf.
Change-Id: I8c8129534ebcca32941ad76b201bb9a0243d8c3e
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 5349984..1e681e9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2154,6 +2154,15 @@
/info
valuefalse/value
/prop
+prop oor:name=GenerateThumbnail oor:type=xs:boolean
oor:nillable=false
+ !-- UIHints: Tools Options - General Save - [Section] Save --
+ info
+descSpecifies whether to generate a thumbnail image and place it
inside the
+ the odf archive file, which makes it possible to see a preview of
the document./desc
+labelStore a preview of this document/label
+ /info
+ valuetrue/value
+/prop
prop oor:name=CreateBackup oor:type=xs:boolean
oor:nillable=false
!-- OldPath: General/Save/Documents --
!-- OldLocation: soffice.cfg --
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 965297c..883b75d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -99,6 +99,7 @@
#include vcl/bitmapex.hxx
#include svtools/embedhlp.hxx
#include basic/modsizeexceeded.hxx
+#include officecfg/Office/Common.hxx
#include osl/file.hxx
#include sfx2/signaturestate.hxx
@@ -1450,8 +1451,9 @@ sal_Bool SfxObjectShell::SaveTo_Impl
}
}
-
-if ( bOk GetCreateMode() != SFX_CREATE_MODE_EMBEDDED
!bPasswdProvided )
+//fdo#61320: only store thumbnail image if the corresponding option is
not disabled in the configuration
+if ( bOk
officecfg::Office::Common::Save::Document::GenerateThumbnail::get()
+ GetCreateMode() != SFX_CREATE_MODE_EMBEDDED
!bPasswdProvided )
{
// store the thumbnail representation image
// the thumbnail is not stored in case of encrypted document
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/Library_avmediavlc.mk config_host.mk.in configure.ac download.lst external/boost external/liborcus RepositoryExternal.mk sc/Library_scfilt.mk sc/qa sc/source
RepositoryExternal.mk | 47 ++--- avmedia/Library_avmediavlc.mk |2 config_host.mk.in |1 configure.ac|1 download.lst|2 external/boost/Module_boost.mk |3 - external/boost/StaticLibrary_boost_iostreams.mk | 35 external/boost/StaticLibrary_boost_system.mk| 29 ++ external/boost/StaticLibrary_boostsystem.mk | 29 -- external/liborcus/ExternalProject_liborcus.mk | 13 +++- external/liborcus/UnpackedTarball_liborcus.mk |5 - sc/Library_scfilt.mk|3 - sc/qa/unit/helper/qahelper.cxx |8 +- sc/source/filter/inc/orcusinterface.hxx | 22 +++- sc/source/filter/orcus/interface.cxx| 66 +++- sc/source/ui/docshell/datastream.cxx|2 16 files changed, 212 insertions(+), 56 deletions(-) New commits: commit 36788e95fdbe96ac27c71197fdbfee178b53f52c Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Wed Jan 8 13:17:28 2014 +0100 upgrade liborcus Conflicts: external/boost/StaticLibrary_boost_system.mk Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 463db2b..a0cd2b8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -615,7 +615,23 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -define gb_LinkTarget__use_boostsystem +define gb_LinkTarget__use_boost_iostreams +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(BOOST_CPPFLAGS) \ +) + +$(call gb_LinkTarget_add_ldflags,$(1),\ + $(BOOST_LDFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(BOOST_IOSTREAMS_LIB) \ +) + +endef + +define gb_LinkTarget__use_boost_system $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(BOOST_CPPFLAGS) \ @@ -631,7 +647,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef -gb_ExternalProject__use_boostsystem := +gb_ExternalProject__use_boost_system := define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_set_include,$(1),\ @@ -668,19 +684,34 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef -define gb_LinkTarget__use_boostsystem +define gb_LinkTarget__use_boost_iostreams +$(call gb_LinkTarget_add_defs,$(1),\ + -DBOOST_ALL_NO_LIB \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + boost_iostreams \ +) + +endef + +define gb_ExternalProject__use_boost_iostreams +$(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams) +endef + +define gb_LinkTarget__use_boost_system $(call gb_LinkTarget_add_defs,$(1),\ -DBOOST_ALL_NO_LIB \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - boostsystem \ + boost_system \ ) endef -define gb_ExternalProject__use_boostsystem -$(call gb_ExternalProject_use_static_libraries,$(1),boostsystem) +define gb_ExternalProject__use_boost_system +$(call gb_ExternalProject_use_static_libraries,$(1),boost_system) endef define gb_LinkTarget__use_boost_headers @@ -2755,7 +2786,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.6$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT) \ ) $(if $(SYSTEM_BOOST), \ @@ -2772,7 +2803,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.6$(gb_StaticLibrary_PLAINEXT) \ + $(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT) \ ) endef diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk index b19eac9..43be24e 100644 --- a/avmedia/Library_avmediavlc.mk +++ b/avmedia/Library_avmediavlc.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_sdk_api,avmediavlc)) $(eval $(call gb_Library_use_externals,avmediavlc,\ boost_headers \ - boostsystem \ + boost_system \ )) $(eval $(call gb_Library_use_libraries,avmediavlc,\ diff --git a/config_host.mk.in b/config_host.mk.in index 2bf9dd4..b9be85d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -35,6 +35,7 @@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@ export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@ diff --git a/configure.ac b/configure.ac index
[Libreoffice-commits] core.git: external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk |5 - 1 file changed, 5 deletions(-) New commits: commit 7801c94bffdabe669601d23e86f2f2a41447902d Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Mar 3 17:59:05 2014 +0100 I think we don't need that Mac patch anymore Change-Id: I6619e70f3f7c8ba4d17be4ca434057948be3d79f diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index d046f80..696c34a 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -21,11 +21,6 @@ liborcus_patches := # don't use dllimport liborcus_patches += liborcus_0.1.0-dllimport.patch -ifeq ($(OS),MACOSX) -# no tac command on OS X, but tail -r -liborcus_patches += liborcus_0.1.0-tac.patch -endif - ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) liborcus_patches += visibility.patch endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#61320: Allow user to choose whether to create thumbnails
Hi Christian, On Mon, 2014-02-10 at 11:53 +0100, Michael Stahl wrote: On 10/02/14 08:42, Christian Junker wrote: Hello developers, this is my first LO patch for review. It enhances LibreOffice by making the thumbnail creation inside odf archive files optional. In some cases users might not want to have a thumbnail included inside their document, because they need the file to be as small as possible. I have added a new save option to the Options dialog under section Load/Save General, whose name might still get improved possibly, so far it is not translated into other languages: Include a thumbnail image. hi Christian, thanks for your patch, the configuration setting is mostly fine ... Right, so I've pushed your patch as http://cgit.freedesktop.org/libreoffice/core/commit/?id=0035b3218d8652652e62afe89eddfd28a9021b75 without the UI changes as discussed in the bug https://bugs.freedesktop.org/show_bug.cgi?id=61320 Thanks for you contribution, indeed for small files it saves a lot. Hopefully, it's easy enough to change the setting in expert config dialog and you can change it just once. I've also added you to https://wiki.documentfoundation.org/Development/Developers#J Looking forward to next contributions, Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #147 from Vossman vossma...@yahoo.com --- Bug 71278 - UI mouse pointer disappears during presentation and does not come back after exiting presentation Nominating this bug, because it is a regression (to 4.0 series and still in 4.2) and because it is really annoying, I have to restart LibreOffice in order to use my mouse again. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/orcus/interface.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 6a71b8d902ae24db1251ea65841dd0f7bfa5e9b3
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 3 18:11:30 2014 +0100
-Werror,-Wunused-parameter
Change-Id: I80b6665b1d5e7f2550439e11df3f98af17ed7c29
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index 5082be5..7a89b62 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -404,10 +404,10 @@ void ScOrcusSharedStrings::set_segment_font_size(double
/*point*/)
{
}
-void
ScOrcusSharedStrings::set_segment_font_color(orcus::spreadsheet::color_elem_t
alpha,
-orcus::spreadsheet::color_elem_t red,
-orcus::spreadsheet::color_elem_t green,
-orcus::spreadsheet::color_elem_t blue)
+void
ScOrcusSharedStrings::set_segment_font_color(orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t)
{
}
@@ -447,10 +447,10 @@ void
ScOrcusStyles::set_font_underline(orcus::spreadsheet::underline_t /*e*/)
{
}
-void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t alpha,
-orcus::spreadsheet::color_elem_t red,
-orcus::spreadsheet::color_elem_t green,
-orcus::spreadsheet::color_elem_t blue)
+void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t)
{
}
@@ -498,10 +498,10 @@ void
ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*di
}
void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t
/*dir*/,
-orcus::spreadsheet::color_elem_t alpha,
-orcus::spreadsheet::color_elem_t red,
-orcus::spreadsheet::color_elem_t green,
-orcus::spreadsheet::color_elem_t blue)
+orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t,
+orcus::spreadsheet::color_elem_t)
{
// implement later
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/tools/PolynomialRegressionCurveCalculator.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 00cb825ab3f16a94f1e8311ba0c24f72588e788e
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Sat Mar 1 00:20:53 2014 +0100
fdo#75538 R^2 calculation for trendline similar to LINEST function
Modify for forced intercept of trendline, calculation of R^2 in the same
way as LINEST function does calculation
Change-Id: Ic943b1ca1bbe30b1a4b88e2a338eb9dc34d848b6
Reviewed-on: https://gerrit.libreoffice.org/8402
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index 90be5a1..9b39e01 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -168,7 +168,6 @@ void SAL_CALL
PolynomialRegressionCurveCalculator::recalculateRegression(
double aSumError = 0.0;
double aSumTotal = 0.0;
double aSumYpred2 = 0.0;
-double aSumYactual2 = 0.0;
for( sal_Int32 i = 0; i aNoValues; i++ )
{
@@ -177,15 +176,14 @@ void SAL_CALL
PolynomialRegressionCurveCalculator::recalculateRegression(
double yPredicted = getCurveValue( xValue );
aSumTotal += (yActual - yAverage) * (yActual - yAverage);
aSumError += (yActual - yPredicted) * (yActual - yPredicted);
-aSumYpred2 += yPredicted * yPredicted;
-aSumYactual2 += yActual * yActual;
+if(mForceIntercept)
+aSumYpred2 += (yPredicted - mInterceptValue) * (yPredicted -
mInterceptValue);
}
double aRSquared = 0.0;
if(mForceIntercept)
{
-if(aSumYactual2 != 0.0)
-aRSquared = aSumYpred2 / aSumYactual2;
+aRSquared = aSumYpred2 / (aSumError + aSumYpred2);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Vossman vossma...@yahoo.com changed: What|Removed |Added Depends on||73548 --- Comment #106 from Vossman vossma...@yahoo.com --- Bug 73548 - text cut-off when exporting .odp to .pdf (OSX only) I would like to nominate this annoying bug. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Vossman vossma...@yahoo.com changed: What|Removed |Added Depends on||71278 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objstor.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 04c7f741f831d87c31b38de5f4074456ad91fb3d
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Mar 3 18:22:57 2014 +0100
minor comment change
Change-Id: If917e7e9897db0fb486f4852feb0d73e951c8b74
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 883b75d..76e9f13 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1451,7 +1451,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
}
}
-//fdo#61320: only store thumbnail image if the corresponding option is
not disabled in the configuration
+//fdo#61320: only store thumbnail image if the corresponding option is
enabled in the configuration
if ( bOk
officecfg::Office::Common::Save::Document::GenerateThumbnail::get()
GetCreateMode() != SFX_CREATE_MODE_EMBEDDED
!bPasswdProvided )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on|73548 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - extensions/source officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk reportdesign/source sc/source sd/source svtoo
extensions/source/propctrlr/standardcontrol.cxx |6 -
officecfg/Configuration_officecfg.mk |1
officecfg/registry/data/org/openoffice/Office/Paths.xcu |8 +-
postprocess/CustomTarget_registry.mk |4 +
reportdesign/source/ui/inc/ViewsWindow.hxx|4 -
reportdesign/source/ui/report/ViewsWindow.cxx |5 -
sc/source/ui/view/prevwsh.cxx |6 +
sd/source/filter/eppt/epptso.cxx |6 +
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |8 +-
sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx |7 +
svtools/source/contnr/svimpbox.cxx|5 -
svtools/source/graphic/grfcache.cxx |8 +-
svtools/source/graphic/grfmgr2.cxx|8 +-
svtools/source/table/tablecontrol_impl.cxx|5 -
svx/source/dialog/framelink.cxx | 16 ++--
svx/source/fmcomp/gridctrl.cxx|3
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |8 +-
sw/source/core/doc/docnum.cxx |3
sw/source/core/docnode/ndtbl.cxx |7 +
sw/source/core/table/swnewtable.cxx |3
sw/source/core/txtnode/fntcache.cxx |6 +
sw/source/ui/docvw/SidebarWin.cxx |6 +
sw/source/ui/sidebar/PageMarginControl.cxx| 36 +-
sw/source/ui/sidebar/PagePropertyPanel.cxx| 36 +-
vcl/generic/print/common_gfx.cxx |7 +
vcl/source/window/syswin.cxx |6 +
vcl/source/window/toolbox.cxx |9 +-
vcl/unx/generic/dtrans/X11_selection.cxx |5 +
28 files changed, 149 insertions(+), 83 deletions(-)
New commits:
commit b2371492dfd5c8003f89ed8acf3dbc690d6af8d0
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 3 18:27:00 2014 +0100
Use cstdlib std::abs instead of stdlib.h abs
...because the latter lacks the abs(long) overload in some popular
environments,
cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60401 stdlib.h does not
provide abs(long) overload.
Similarly, stdlib.h lacks the abs(float), abs(double), abs(long double)
overloads compared to cmath there, whose use was apparently intended in
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx. Rewrote that to use
CPPUNIT_ASSERT_DOUBLES_EQUAL instead, which revealed that the comparisons
need
rather large deltas of .1 resp. .2 (which the original code hid with an
implicit conversion to integral type, thus using an effective delta of 1).
Discovered with -Wabsolute-value (absolute value function 'abs' given an
argument of type 'long' but has parameter of type 'int' which may cause
truncation of value) recently introduced on Clang trunk towards 3.5.
Change-Id: I4c41575ffdccb2944498b662bd3a53fd510cb0c0
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/extensions/source/propctrlr/standardcontrol.cxx
index 7d7d38a..b12261e 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -46,7 +46,7 @@
#include vcl/svapp.hxx
#include vcl/settings.hxx
-
+#include cstdlib
#include limits
#include boost/bind.hpp
#include boost/scoped_ptr.hpp
@@ -392,8 +392,8 @@ namespace pcr
void HyperlinkInput::impl_checkEndClick( const ::MouseEvent rMEvt )
{
const MouseSettings rMouseSettings( GetSettings().GetMouseSettings()
);
-if ( ( abs( rMEvt.GetPosPixel().X() - m_aMouseButtonDownPos.X() )
rMouseSettings.GetStartDragWidth() )
- ( abs( rMEvt.GetPosPixel().Y() - m_aMouseButtonDownPos.Y() )
rMouseSettings.GetStartDragHeight() )
+if ( ( std::abs( rMEvt.GetPosPixel().X() -
m_aMouseButtonDownPos.X() ) rMouseSettings.GetStartDragWidth() )
+ ( std::abs( rMEvt.GetPosPixel().Y() -
m_aMouseButtonDownPos.Y() ) rMouseSettings.GetStartDragHeight() )
)
Application::PostUserEvent( m_aClickHandler );
}
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx
b/reportdesign/source/ui/inc/ViewsWindow.hxx
index b62c0f0..c63728a 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -65,9 +65,9 @@ namespace rptui
case POS_DOWN:
return lhs.Bottom() = rhs.Bottom();
case POS_CENTER_HORIZONTAL:
-return abs(m_aRefPoint.X() - lhs.Center().X())
abs(m_aRefPoint.X() - rhs.Center().X());
+return std::abs(m_aRefPoint.X() - lhs.Center().X())
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util setup_nati
cui/source/dialogs/about.cxx|2
+-
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/util/openoffice.lst|2
+-
setup_native/source/win32/nsis/ooobitmap.bmp|binary
setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
solenv/bin/modules/installer/globals.pm |2
+-
8 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 66f974e05bfa78dbfafb4283dd79bca1eaf47f1d
Author: Andre Fischer a...@apache.org
Date: Mon Mar 3 17:04:10 2014 +
124272: Wrong initialization of (merged from branch AOO410).
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index e9cf323..e8eb679 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -156,7 +156,7 @@ BEGIN
$fontsfoldername = Fonts;
$fontsdirparent = ;
$fontsdirhostname = truetype;
-$fontsdirname = $fontsdirhostname;
+$fontsdirname = ;
$officefolder = OfficeFolder;
$officemenufolder = OfficeMenuFolder;
$startupfolder = StartupFolder;
commit ad9eed7acf5b693b641cf6d130739e04aa5e
Author: Jürgen Schmidt j...@apache.org
Date: Mon Mar 3 16:37:25 2014 +
#124311# merge fixes from AOO410 branch
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 7dfe13d..13b87e3 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId
rId ) :
sbcopyright.appendAscii(Copyright );
sbcopyright.append((sal_Unicode)0x00a9);
sbcopyright.appendAscii( );
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM(2013) );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM(2014) );
if (vendor.EqualsAscii(Apache Software Foundation)) {
sbcopyright.append(sYear);
sbcopyright.appendAscii( The Apache Software Foundation.\n\n);
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
index da145cb..5e1a944 100644
Binary files
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp differ
diff --git
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
index da145cb..5e1a944 100644
Binary files
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
index 51f8892..5d89ff4 100644
Binary files
a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 6621328..2017ef0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -321,7 +321,7 @@ Apache_OpenOffice_Beta_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
-AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Beta-SDK
+AOODOWNLOADNAMEPREFIX Apache_OpenOffice_Beta-SDK
STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp
b/setup_native/source/win32/nsis/ooobitmap.bmp
index 57ca123..5e1a944 100644
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and
b/setup_native/source/win32/nsis/ooobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
index b2a3f3e..5d89ff4 100644
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 66/f974e05bfa78dbfafb4283dd79bca1eaf47f1d
66/f974e05bfa78dbfafb4283dd79bca1eaf47f1d |1 + 1 file changed, 1 insertion(+) New commits: commit 9ba79cdce29d390d564710b11add6e172a5dc16d Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 3 18:40:49 2014 + Notes added by 'git notes add' diff --git a/66/f974e05bfa78dbfafb4283dd79bca1eaf47f1d b/66/f974e05bfa78dbfafb4283dd79bca1eaf47f1d new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/66/f974e05bfa78dbfafb4283dd79bca1eaf47f1d @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ad/9eed11117acf5b693b641cf6d130739e04aa5e
ad/9eed7acf5b693b641cf6d130739e04aa5e |1 + 1 file changed, 1 insertion(+) New commits: commit c42d1cec086961744bdfdd6031ca43c7f86d9c73 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 3 18:41:14 2014 + Notes added by 'git notes add' diff --git a/ad/9eed7acf5b693b641cf6d130739e04aa5e b/ad/9eed7acf5b693b641cf6d130739e04aa5e new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/ad/9eed7acf5b693b641cf6d130739e04aa5e @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfvalue.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 4452fa9a2e741834a19c9b322fc8d9c8b06450de
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 3 18:54:01 2014 +0100
RTFValue::equals: consider the number of attributes/sprms as well
Change-Id: Ic0cfa01f7a75c81130ac9ff39a971a678a820ee1
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx
b/writerfilter/source/rtftok/rtfvalue.cxx
index 2121358..9a582bf 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -223,7 +223,13 @@ RTFValue* RTFValue::Clone()
bool RTFValue::equals(RTFValue rOther)
{
-return m_nValue == rOther.m_nValue;
+if (m_nValue != rOther.m_nValue)
+return false;
+if (m_pAttributes-size() != rOther.m_pAttributes-size())
+return false;
+if (m_pSprms-size() != rOther.m_pSprms-size())
+return false;
+return true;
}
RTFSprms RTFValue::getAttributes()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 26 ---
writerfilter/source/doctok/resources.xmi | 92 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 28 +--
3 files changed, 21 insertions(+), 125 deletions(-)
New commits:
commit a6158500abb906b62bb36b5c17802ecbb3ec8119
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 3 20:29:13 2014 +0100
writerfilter: convert sprm:C{Lid,LidBi,RgLid0,RgLid1}
Change-Id: I07e73a792230e6dc344c7120e3ad3c5f92a40769
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 8023f3d..39ce894 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1463,8 +1463,6 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
handleUnderlineType(nIntValue, rContext);
}
break;
-case NS_sprm::LN_CLid:
-break; // sprmCLid
case NS_sprm::LN_CIco:
{
sal_Int32 nColor = 0;
@@ -1604,30 +1602,6 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
}
break;
}
-case NS_sprm::LN_CLidBi: // sprmCLidBi language complex
-case NS_sprm::LN_CRgLid0:// sprmCRgLid0language Western
-case NS_sprm::LN_CRgLid1:// sprmCRgLid1language Asian
-{
-lang::Locale aLocale( LanguageTag(
(LanguageType)nIntValue).getLocale());
-
-PropertyIds aPropId;
-switch (nSprmId)
-{
-case NS_sprm::LN_CRgLid0:
-aPropId = PROP_CHAR_LOCALE;
-break;
-case NS_sprm::LN_CRgLid1:
-aPropId = PROP_CHAR_LOCALE_ASIAN;
-break;
-default:
-aPropId = PROP_CHAR_LOCALE_COMPLEX;
-break;
-}
-
-rContext-Insert(aPropId, uno::makeAny( aLocale ) );
-}
-break;
-
case NS_ooxml::LN_EG_SectPrContents_type:
/* break type
0 - No break
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index f4561e7..4d0b7dd 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -131,37 +131,6 @@
/UML:ModelElement.taggedValue
/UML:Class
!--SPRM sprmCKul--
-!--SPRM sprmCLid--
-UML:Class xmi.id=sprmCLid name=sprmCLid
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8sprm/
- /UML:ModelElement.stereotype
- UML:ModelElement.taggedValue
-UML:TaggedValue
- UML:TaggedValue.dataValue0x4A41/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmcode/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
-
UML:TaggedValue.dataValuertf:sprmCLid/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmid/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
- UML:TaggedValue.dataValuecharacter/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=kind/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
-/UML:Class
-!--SPRM sprmCLid--
!--SPRM sprmCIco--
UML:Class xmi.id=sprmCIco name=sprmCIco
UML:ModelElement.stereotype
@@ -286,37 +255,6 @@
/UML:ModelElement.taggedValue
/UML:Class
!--SPRM sprmCRgFtc2--
-!--SPRM sprmCLidBi--
-UML:Class xmi.id=sprmCLidBi name=sprmCLidBi
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8sprm/
- /UML:ModelElement.stereotype
- UML:ModelElement.taggedValue
-UML:TaggedValue
- UML:TaggedValue.dataValue0x485F/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmcode/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
-
UML:TaggedValue.dataValuertf:sprmCLidBi/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmid/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
-
Re: Current Build from Git: Writer-Wizards don't run
Hi Stephan, Am 03.03.2014 12:02, schrieb Stephan Bergmann: On 03/02/2014 05:45 PM, Andreas Mantke wrote: I build LibreOffice from the current master on my openSuSE 12.3-x64 and the Writer wizzards don't run anymore. Fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=97822e3cbc63d3bd110bc3c654b3fbb4d4d1904c Wizards should look for templates in Template_internal, not Template_user. created a new build from the current git pull (Build ID: 04c7f741f831d87c31b38de5f4074456ad91fb3d) and get the following messages once I run LibreOffice from command line and call the letter wizard: ./soffice Traceback (most recent call last): File /home/username/libreoffice/libogitrepo/gerritgit/libo3/instdir/program/wizards/common/FileAccess.py, line 156, in getFolderTitles nameList = xInterface.getFolderContents(FolderName, False) wizards.common.FileAccess.com.sun.star.ucb.InteractiveAugmentedIOException: an error occurred during opening a directory Traceback (most recent call last): File /home/username/libreoffice/libogitrepo/gerritgit/libo3/instdir/program/wizards/common/FileAccess.py, line 156, in getFolderTitles nameList = xInterface.getFolderContents(FolderName, False) wizards.common.FileAccess.com.sun.star.ucb.InteractiveAugmentedIOException: an error occurred during opening a directory Traceback (most recent call last): File /home/username/libreoffice/libogitrepo/gerritgit/libo3/instdir/program/wizards/common/FileAccess.py, line 156, in getFolderTitles nameList = xInterface.getFolderContents(FolderName, False) wizards.common.FileAccess.com.sun.star.ucb.InteractiveAugmentedIOException: an error occurred during opening a directory Traceback (most recent call last): File /home/username/libreoffice/libogitrepo/gerritgit/libo3/instdir/program/wizards/letter/LetterWizardDialogImpl.py, line 96, in startWizard self.initializeTemplates(xMSF) File /home/username/libreoffice/libogitrepo/gerritgit/libo3/instdir/program/wizards/letter/LetterWizardDialogImpl.py, line 766, in initializeTemplates tuple(self.BusinessFiles[0]) IndexError: list index out of range The letter wizard doesn't show up. Regards, Andreas -- ## Developer LibreOffice ## Freie Office-Suite für Linux, Mac, Windows ## http://LibreOffice.org ## Support the Document Foundation (http://documentfoundation.org) ## Meine Seite: http://www.amantke.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6d9de6bbe9133bb0c7710489a2ba531d7d43eca6 Author: David Tardon dtar...@redhat.com Date: Mon Mar 3 20:39:13 2014 +0100 fix build with system boost Change-Id: I3834355674e0b9a947bfc10d9872d3a4805bf552 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a0cd2b8..4ff6748 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -631,6 +631,8 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +gb_ExternalProject__use_boost_iostreams := + define gb_LinkTarget__use_boost_system $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Helpers needed ?
Want to help make Libre available to Android ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salprn.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4e62ac053bf6cb094130f3ba914b6f4485d3e0a2
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 3 22:18:29 2014 +0100
Use cstdlib std::abs instead of stdlib.h abs: Mac-specific code
Change-Id: I919b1a931145a49c32ec601109be083b49f10f7b
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 751570a..dfaaf7e 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -39,6 +39,7 @@
#include com/sun/star/uno/Sequence.hxx
#include algorithm
+#include cstdlib
using namespace vcl;
using namespace com::sun::star;
@@ -725,8 +726,8 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long
i_nWidth, long i_nHeight,
{
for( size_t i = 0; i m_aPaperFormats.size(); i++ )
{
-if( abs( m_aPaperFormats[i].getWidth() - i_nWidth ) 50
-abs( m_aPaperFormats[i].getHeight() - i_nHeight ) 50 )
+if( std::abs( m_aPaperFormats[i].getWidth() - i_nWidth ) 50
+std::abs( m_aPaperFormats[i].getHeight() - i_nHeight ) 50 )
{
pMatch = m_aPaperFormats[i];
return pMatch;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/graphicfilter.cxx | 64 ++--
1 file changed, 40 insertions(+), 24 deletions(-)
New commits:
commit 115ae1259564a51a14a3363a00717b09882d55bf
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Mar 3 22:30:32 2014 +0100
fdo#75487 Store svgz decompressed (as plain svg) in the document.
Put decompressed svg in GfxLink so that when the document is
saved, the graphics is stored as plain svg. This is done so
because of backwards compatibility (older LO won't be able to
read compressed svg data in the document) and because the document
itself is already compressed.
Change-Id: I125005dfba785701e756487092f25bb90bcd2bcb
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 813600f..71e55e0 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1343,7 +1343,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
WMF_EXTERNALHEADER *pExtHeader )
{
OUStringaFilterName;
-sal_uLong nStmBegin;
+sal_uLong nStreamBegin;
sal_uInt16 nStatus;
GraphicReader* pContext = rGraphic.GetContext();
GfxLinkType eLinkType = GFX_LINK_TYPE_NONE;
@@ -1355,6 +1355,9 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
boolbAllowPartialStreamRead = false;
boolbCreateNativeLink = true;
+sal_uInt8* pGraphicContent = NULL;
+sal_Int32 nGraphicContentSize = 0;
+
ResetLastError();
if ( pFilterData )
@@ -1394,10 +1397,10 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
if( bDummyContext )
{
rGraphic.SetContext( NULL );
-nStmBegin = 0;
+nStreamBegin = 0;
}
else
-nStmBegin = rIStream.Tell();
+nStreamBegin = rIStream.Tell();
bAbort = false;
nStatus = ImpTestOrFindFormat( rPath, rIStream, nFormat );
@@ -1406,11 +1409,11 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
{
rGraphic.SetContext( (GraphicReader*) 1 );
rIStream.ResetError();
-rIStream.Seek( nStmBegin );
+rIStream.Seek( nStreamBegin );
return (sal_uInt16) ImplSetError( GRFILTER_OK );
}
-rIStream.Seek( nStmBegin );
+rIStream.Seek( nStreamBegin );
if( ( nStatus != GRFILTER_OK ) || rIStream.GetError() )
return (sal_uInt16) ImplSetError( ( nStatus != GRFILTER_OK ) ?
nStatus : GRFILTER_OPENERROR, rIStream );
@@ -1425,7 +1428,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
if( pContext !bDummyContext )
aFilterName = pContext-GetUpperFilterName();
-nStmBegin = 0;
+nStreamBegin = 0;
nStatus = GRFILTER_OK;
}
@@ -1540,6 +1543,11 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
aMemStream.Seek(STREAM_SEEK_TO_BEGIN);
aMemStream.Read(aNewData.get(), nMemoryLength);
+// Make a uncompressed copy for GfxLink
+nGraphicContentSize = nMemoryLength;
+pGraphicContent = new sal_uInt8[nGraphicContentSize];
+std::copy(aNewData.get(), aNewData.get() +
nMemoryLength, pGraphicContent);
+
if(!aMemStream.GetError() )
{
SvgDataPtr aSvgDataPtr(new SvgData(aNewData,
nMemoryLength, rPath));
@@ -1742,28 +1750,36 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
if( nStatus == GRFILTER_OK bCreateNativeLink ( eLinkType !=
GFX_LINK_TYPE_NONE ) !rGraphic.GetContext() !bLinkSet )
{
-const sal_uLong nStmEnd = rIStream.Tell();
-const sal_uLong nBufSize = nStmEnd - nStmBegin;
-
-if( nBufSize )
+if (pGraphicContent == NULL)
{
-sal_uInt8* pBuf=0;
-try
-{
-pBuf = new sal_uInt8[ nBufSize ];
-}
-catch (const std::bad_alloc)
-{
-nStatus = GRFILTER_TOOBIG;
-}
+const sal_uLong nStreamEnd = rIStream.Tell();
+nGraphicContentSize = nStreamEnd - nStreamBegin;
-if( nStatus == GRFILTER_OK )
+if (nGraphicContentSize 0)
{
-rIStream.Seek( nStmBegin );
-rIStream.Read( pBuf, nBufSize );
-rGraphic.SetLink( GfxLink( pBuf, nBufSize, eLinkType, true ) );
+try
+{
+pGraphicContent = new
[Libreoffice-commits] core.git: scripting/source sd/source
scripting/source/stringresource/stringresource.cxx |2 +-
sd/source/ui/unoidl/unopage.cxx|4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c4cff5a6452c05c797742327f57bb682fa5379ce
Author: Donizete Waterkemper dwat...@gmail.com
Date: Mon Mar 3 17:22:15 2014 -0300
fdo#54938: Convert some places to use cppu::supportsService
Change-Id: Ib941c6ec82d81b1da815561eee87ee91dc8de200
Reviewed-on: https://gerrit.libreoffice.org/8443
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Marcos Paulo de Souza marcos.souza@gmail.com
diff --git a/scripting/source/stringresource/stringresource.cxx
b/scripting/source/stringresource/stringresource.cxx
index dc114f2..39a42a7 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -788,7 +788,7 @@ OUString
StringResourcePersistenceImpl::getImplementationName( )
sal_Bool StringResourcePersistenceImpl::supportsService( const OUString
rServiceName )
throw (RuntimeException, std::exception)
{
-return StringResourceImpl::supportsService( rServiceName );
+return cppu::supportsService( this, rServiceName );
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 2953e27..09cdc3f 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2243,7 +2243,7 @@ Sequence OUString SAL_CALL
SdDrawPage::getSupportedServiceNames() throw(uno::
sal_Bool SAL_CALL SdDrawPage::supportsService( const OUString ServiceName )
throw(uno::RuntimeException, std::exception)
{
-return SdGenericDrawPage::supportsService( ServiceName );
+return cppu::supportsService( this, ServiceName );
}
// XNamed
@@ -2799,7 +2799,7 @@ Sequence OUString SAL_CALL
SdMasterPage::getSupportedServiceNames() throw(uno
sal_Bool SAL_CALL SdMasterPage::supportsService( const OUString ServiceName )
throw(uno::RuntimeException, std::exception)
{
-return SdGenericDrawPage::supportsService( ServiceName );
+return cppu::supportsService( this, ServiceName );
}
// XElementAccess
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #60 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Donizete Waterkemper committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c4cff5a6452c05c797742327f57bb682fa5379ce fdo#54938: Convert some places to use cppu::supportsService The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - config_host.mk.in configure.ac desktop/Executable_crashrep_com.mk desktop/Executable_crashrep.com.mk desktop/Executable_soffice_bin.mk desktop/Executable_so
config_host.mk.in |1 configure.ac|2 desktop/Executable_crashrep.com.mk | 26 -- desktop/Executable_crashrep_com.mk | 26 ++ desktop/Executable_soffice.bin.mk | 58 -- desktop/Executable_soffice_bin.mk | 58 ++ desktop/Executable_unopkg.bin.mk| 31 desktop/Executable_unopkg.com.mk| 22 desktop/Executable_unopkg_bin.mk| 31 desktop/Executable_unopkg_com.mk| 22 desktop/Module_desktop.mk |8 +-- pyuno/Executable_python.mk | 24 + pyuno/Executable_python_wrapper.mk | 24 - pyuno/Module_pyuno.mk |2 scp2/InstallModule_ooo.mk | 15 - shell/Library_syssh.mk | 22 +++- shell/Library_syssh_win.mk | 33 - shell/Module_shell.mk |3 - svx/Executable_gengal.bin.mk| 71 svx/Executable_gengal.mk| 71 svx/Module_svx.mk |2 unodevtools/Executable_skeletonmaker.mk | 41 unodevtools/Executable_uno-skeletonmaker.mk | 41 unodevtools/Module_unodevtools.mk |2 24 files changed, 301 insertions(+), 335 deletions(-) New commits: commit 916e86e9d9d596c7aa12e0a1d8bbacdd4a2e4598 Author: Michael Stahl mst...@redhat.com Date: Mon Mar 3 23:30:24 2014 +0100 svx: rename Executable_gengal.bin.mk too Change-Id: I8dfe131d1c225b5d9aaa044b02ec8cdc3d97a23c diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.mk similarity index 100% rename from svx/Executable_gengal.bin.mk rename to svx/Executable_gengal.mk diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index e304ed9..007fe34 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,svx,\ -Executable_gengal.bin \ +Executable_gengal \ Package_gengal \ )) endif commit c02a905115bfcbe06c384e5fcad56eecd3b81fdf Author: Michael Stahl mst...@redhat.com Date: Mon Mar 3 23:28:28 2014 +0100 desktop: rename Executable*.bin.mk/.com.mk Change-Id: Ibb0970cfde65b331a4b870cc254b0a6481889edf diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep_com.mk similarity index 100% rename from desktop/Executable_crashrep.com.mk rename to desktop/Executable_crashrep_com.mk diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice_bin.mk similarity index 100% rename from desktop/Executable_soffice.bin.mk rename to desktop/Executable_soffice_bin.mk diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg_bin.mk similarity index 100% rename from desktop/Executable_unopkg.bin.mk rename to desktop/Executable_unopkg_bin.mk diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg_com.mk similarity index 100% rename from desktop/Executable_unopkg.com.mk rename to desktop/Executable_unopkg_com.mk diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index c325176..584b70d 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -37,8 +37,8 @@ endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,desktop,\ -Executable_soffice.bin \ -Executable_unopkg.bin \ +Executable_soffice_bin \ +Executable_unopkg_bin \ Library_migrationoo2 \ Library_migrationoo3 \ Library_unopkgapp \ @@ -65,7 +65,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,desktop,\ StaticLibrary_winextendloaderenv \ StaticLibrary_winlauncher \ -Executable_crashrep.com \ +Executable_crashrep_com \ Executable_quickstart \ Executable_sbase \ Executable_scalc \ @@ -77,7 +77,7 @@ $(eval $(call gb_Module_add_targets,desktop,\ Executable_swriter \ Executable_unoinfo \ Executable_unopkg \ -Executable_unopkg.com \ +Executable_unopkg_com \ WinResTarget_quickstart \ WinResTarget_sbase \ WinResTarget_scalc \ commit fd7cf77ad5e353d4332ed65dfa4252c841cd85f7 Author: Michael Stahl mst...@redhat.com Date: Mon Mar 3 22:47:30 2014 +0100 pyuno: rename Executable_python_wrapper.mk Change-Id: I653cb0e36c1faa622ecc90e0316a1f1fd1e843db diff --git a/pyuno/Executable_python_wrapper.mk b/pyuno/Executable_python.mk similarity index 100% rename from pyuno/Executable_python_wrapper.mk rename to pyuno/Executable_python.mk diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index b79c21d..9a07993 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -33,7 +33,7
[Libreoffice-commits] core.git: 9 commits - lotuswordpro/source sw/qa
lotuswordpro/source/filter/lwplayout.cxx | 13 -
lotuswordpro/source/filter/lwplaypiece.cxx | 18 +-
lotuswordpro/source/filter/lwppagehint.cxx | 11 ++-
lotuswordpro/source/filter/lwppagelayout.cxx |8 ++--
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |2 +-
5 files changed, 46 insertions(+), 6 deletions(-)
New commits:
commit 4402efc18ae16e279d55858946d2c8b8972f3f9f
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 18:46:44 2014 -0600
coverity#738722: Unitialized scalar field
Change-Id: Ice90cf6929c2cb5e268d18e20208835c3df18bc1
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index da1f363..5dbf65f 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -78,6 +78,12 @@
LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader objHdr, LwpSvStream* pStrm)
: LwpDLNFPVList(objHdr, pStrm)
+, m_nAttributes(0)
+, m_nAttributes2(0)
+, m_nAttributes3(0)
+, m_nOverrideFlag(0)
+, m_nDirection(0)
+, m_nEditorID(0)
{
}
commit 8c9a3e4fe6703a8c43e5cff113d70031f94af004
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 18:44:05 2014 -0600
coverity#738723: Unitialized scalar field
Change-Id: I6cd56e57024f020799c5017f9d54b1f5e5af65d1
diff --git a/lotuswordpro/source/filter/lwplayout.cxx
b/lotuswordpro/source/filter/lwplayout.cxx
index d24aeb4..da1f363 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1925,7 +1925,12 @@ LwpVirtualLayout* LwpLayout::GetContainerLayout()
}
LwpPlacableLayout::LwpPlacableLayout( LwpObjectHeader objHdr, LwpSvStream*
pStrm )
-: LwpLayout(objHdr, pStrm),m_pFont(NULL)
+: LwpLayout(objHdr, pStrm)
+, m_nWrapType(0)
+, m_nBuoyancy(0)
+, m_nBaseLineOffset(0)
+, m_nPageNumber(0)
+, m_pFont(NULL)
{}
LwpPlacableLayout::~LwpPlacableLayout()
commit b2a774a7e58b8f06b8bf88813f9dc8db529bf127
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 18:40:03 2014 -0600
coverity#738724: Unitialized scalar field
Change-Id: I673457818968f34f73fba988f67eda0547a234a0
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx
b/lotuswordpro/source/filter/lwplaypiece.cxx
index 41ec4a2..80c8d08 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -334,6 +334,12 @@ void LwpLayoutGutters::Parse(IXFStream* /*pOutputStream*/)
{}
LwpJoinStuff::LwpJoinStuff()
+: m_nPercentage(0)
+, m_nCorners(0)
+, m_nWidth(0)
+, m_nHeight(0)
+, m_nID(0)
+, m_nScaling(0)
{}
LwpJoinStuff::~LwpJoinStuff()
commit 2589d9e3e6e9fab18ff735561991a3dcdd3d8b4b
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 18:36:38 2014 -0600
coverity#738727: Unitialized scalar field
Change-Id: I37bdf601f7a6bb179f8a14dfb22d3e102868fea1
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx
b/lotuswordpro/source/filter/lwplaypiece.cxx
index ce95003..41ec4a2 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -260,7 +260,9 @@ void LwpColumnInfo:: Read(LwpObjectStream *pStrm)
}
LwpLayoutColumns::LwpLayoutColumns(LwpObjectHeader objHdr, LwpSvStream* pStrm)
-: LwpVirtualPiece(objHdr, pStrm),m_pColumns(NULL)
+: LwpVirtualPiece(objHdr, pStrm)
+, m_nNumCols(0)
+, m_pColumns(NULL)
{}
LwpLayoutColumns::~LwpLayoutColumns()
commit c1788970adaa374f9b67f20f4385222b3a4d3c33
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 18:33:33 2014 -0600
coverity#738726: Unitialized scalar field
Change-Id: I2c2354e95cc73c2f68b4feb0196754d26be4c19a
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx
b/lotuswordpro/source/filter/lwplaypiece.cxx
index 76e90a1..ce95003 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -103,6 +103,12 @@ void LwpLayoutGeometry::Parse(IXFStream* /*pOutputStream*/)
LwpLayoutScale::LwpLayoutScale(LwpObjectHeader objHdr, LwpSvStream* pStrm)
: LwpVirtualPiece(objHdr, pStrm)
+, m_nScaleMode(0)
+, m_nScalePercentage(0)
+, m_nScaleWidth(0)
+, m_nScaleHeight(0)
+, m_nContentRotation(0)
+, m_nPlacement(0)
{}
LwpLayoutScale::~LwpLayoutScale()
commit d6dbee71e3e9087007345aa825903c12c2bf11ca
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 18:31:24 2014 -0600
coverity#738725: Unitialized scalar field
Change-Id: I809fb83fcffbf6974d8dac98fffcf7b019675b6e
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx
b/lotuswordpro/source/filter/lwplaypiece.cxx
index 56f2307..76e90a1 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -240,6 +240,8 @@ void LwpLayoutExternalBorder::Parse(IXFStream*
/*pOutputStream*/)
{}
OpenGrok problems
Hi all, Sorry if this is the wrong list, but who looks after opengrok.libreoffice.org? Currently search isn't working, it gives some sort of error. Thanks, Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn stephane.guil...@gmail.com changed: What|Removed |Added Depends on||51819 --- Comment #148 from chtfn stephane.guil...@gmail.com --- Nominating Bug 51819 - Password-protected documents saved unencrypted for auto-recovery Bug is serious security issue. Regression apparently appeared in 3.4.2.1 and is assumed to be still present in the 4.2 branch. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn stephane.guil...@gmail.com changed: What|Removed |Added Depends on|51819 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 chtfn stephane.guil...@gmail.com changed: What|Removed |Added Depends on||51819 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/kohei/double-border-fix'
New branch 'private/kohei/double-border-fix' available with the following commits: commit 75fe53378dbd7d13b9f7efb39ddd86c6af898b18 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Mar 3 21:31:49 2014 -0500 fdo#75260: Correctly set distances for double lines. Not just the simple double lines, but the thin think double lines as well. TODO : Look into Word import filters and adjust simple double lines there. Change-Id: I7724c1d7d7734d864688f79afa9eab695f70b1af commit 434ccb772fd982eabaece437654caef5c4a679ba Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Mar 3 17:58:11 2014 -0500 Pass the current scaling factors to the border styles. They will be used to properly space dashed borders based on current zoom levels. Change-Id: I59abd13b71ad74635730816ab1006bd1a683f339 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - lotuswordpro/source
lotuswordpro/source/filter/lwpfont.hxx|5 +++-
lotuswordpro/source/filter/lwpfootnote.cxx|3 ++
lotuswordpro/source/filter/lwpfootnote.hxx| 15 --
lotuswordpro/source/filter/lwpframelayout.cxx |5
lotuswordpro/source/filter/lwpfrib.cxx| 12 +++
lotuswordpro/source/filter/lwpfribmark.cxx| 27 --
lotuswordpro/source/filter/lwpfribmark.hxx|5 +++-
7 files changed, 54 insertions(+), 18 deletions(-)
New commits:
commit 15aeb69e5b4b8f41e303b664597754a5f838276a
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 21:47:28 2014 -0600
coverity#738709 Unitialized scalar field
Change-Id: Ic2480dda2ceb1afd768effcc3df718fb73a222fb
diff --git a/lotuswordpro/source/filter/lwpfont.hxx
b/lotuswordpro/source/filter/lwpfont.hxx
index 7cdf58d..408b314 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -234,7 +234,10 @@ private:
class LwpFontAttrManager
{
public:
-LwpFontAttrManager():m_pFontAttrs(NULL){}
+LwpFontAttrManager()
+: m_nCount(0)
+, m_pFontAttrs(NULL)
+{}
~LwpFontAttrManager();
public:
void Read(LwpObjectStream *pStrm);
commit 89d6bef541bf894f27bcb79d96220f60aacbf77c
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 21:45:28 2014 -0600
coverity#738710 Unitialized scalar field
Change-Id: I441e4f712431c906acaaee88f5eee2531224a73d
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 0d59084..0cd3216 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -146,6 +146,8 @@ LwpFootnote* LwpFribFootnote::GetFootnote()
LwpFootnote::LwpFootnote(LwpObjectHeader objHdr, LwpSvStream *pStrm)
: LwpOrderedObject(objHdr, pStrm)
+, m_nType(0)
+, m_nRow(0)
{
}
commit cc14fe3a58db591c9f5042403fb21308e8f2990b
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 21:44:44 2014 -0600
coverity#738711 Unitialized scalar field
Change-Id: I6cc731825bf6e499fc903cd43448b288d44bc3b1
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 31078ad..0d59084 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -439,6 +439,7 @@ void LwpFootnoteSeparatorOptions::Read(LwpObjectStream
*pObjStrm)
LwpFootnoteOptions::LwpFootnoteOptions(LwpObjectHeader objHdr, LwpSvStream
*pStrm)
: LwpObject(objHdr, pStrm)
+, m_nFlag(0)
{
}
commit 240dee4a55186119d74a1ac36f92d54769d636c0
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 21:43:47 2014 -0600
coverity#738712 Unitialized scalar field
Change-Id: Ia1433be559d445ba3ae4d118003a59275c0e9bd5
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx
b/lotuswordpro/source/filter/lwpfootnote.hxx
index f4f0dcf..e7ece5f 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -166,7 +166,11 @@ protected:
class LwpFootnoteNumberOptions
{
public:
-LwpFootnoteNumberOptions(){}
+LwpFootnoteNumberOptions()
+: m_nFlag(0)
+, m_nStartingNumber(0)
+{}
+
~LwpFootnoteNumberOptions(){}
void Read(LwpObjectStream* pObjStrm);
private:
commit 006299c50d4b53bfb0db7015f97014dec80891c7
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 21:42:39 2014 -0600
coverity#738713 Unitialized scalar field
Change-Id: I9241531bd9c7881c6edb57c4f3c0c8b594dae0d6
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx
b/lotuswordpro/source/filter/lwpfootnote.hxx
index d05cb48..f4f0dcf 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -198,7 +198,14 @@ public:
class LwpFootnoteSeparatorOptions
{
public:
-LwpFootnoteSeparatorOptions(){}
+LwpFootnoteSeparatorOptions()
+: m_nFlag(0)
+, m_nLength(0)
+, m_nIndent(0)
+, m_nAbove(0)
+, m_nBelow(0)
+{}
+
~LwpFootnoteSeparatorOptions(){}
void Read(LwpObjectStream* pObjStrm);
private:
commit 03c62fa7d7c3bc7058dbd5cf4629ca81ac51650f
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 3 21:40:45 2014 -0600
coverity#738714 Unitialized scalar field
Change-Id: I760f56eb7f2af7dd8f836b6dc60914d2381e3a95
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 9a73c7b..412f89f 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1200,6 +1200,11 @@ void LwpDropcapLayout::RegisterStyle()
LwpRubyLayout::LwpRubyLayout(LwpObjectHeader objHdr, LwpSvStream* pStrm)
: LwpFrameLayout(objHdr, pStrm)
+, m_nPlacement(0)
+, m_nAlignment(0)
+, m_nStateFlag(0)
+, m_nXOffset(0)
+
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/profile.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 430237b3fa16bda228ff82b93228f28894568671 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Mar 3 22:01:04 2014 -0600 coverity#706154: Dest buffer too small Change-Id: Ib80ed6bbacad9fdbe7a8fbafdd71bb11037e38cb diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c index e9c5144..906109b 100644 --- a/sal/osl/unx/profile.c +++ b/sal/osl/unx/profile.c @@ -2026,11 +2026,11 @@ static sal_Bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile) pszTmpFile[0] = '\0'; pszIniFile[0] = '\0'; -osl_ProfileGenerateExtension(pProfile-m_FileName, bak, pszBakFile, PATH_MAX); +osl_ProfileGenerateExtension(pProfile-m_FileName, bak, pszBakFile, PATH_MAX - 1); -strcpy(pszIniFile,pProfile-m_FileName); +strcpy(pszIniFile, pProfile-m_FileName); -osl_ProfileGenerateExtension(pProfile-m_FileName, tmp, pszTmpFile, PATH_MAX); +osl_ProfileGenerateExtension(pProfile-m_FileName, tmp, pszTmpFile, PATH_MAX - 1); /* unlink bak */ unlink( pszBakFile ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/double-border-fix' - drawinglayer/source
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 15 --
1 file changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 01ba7a91a6c10c309f6a0429fadb98fa1e388d4d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Mar 3 23:48:42 2014 -0500
Move the lines first then clip.
Change-Id: I4b7706dbd0a662637c3e8e8c00ef376b23eb0189
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 0a85527..67efa09 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -53,8 +53,7 @@ primitive2d::Primitive2DReference makeHairLinePrimitive(
basegfx::B2DPolygon aPolygon;
aPolygon.append(rStart);
aPolygon.append(rEnd);
-if (fGap != 0.0)
-moveLine(aPolygon, fGap, rVector);
+moveLine(aPolygon, fGap, rVector);
return primitive2d::Primitive2DReference(new
primitive2d::PolygonHairlinePrimitive2D(aPolygon, rColor));
}
@@ -73,15 +72,14 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
aPolygon.append(rStart - aLineWidthOffset);
aPolygon.setClosed(true);
+moveLine(aPolygon, fGap, rVector);
+
basegfx::B2DPolyPolygon aClipped =
basegfx::tools::clipPolygonOnPolyPolygon(aPolygon, rClipRegion, true,
false);
if (aClipped.count())
aPolygon = aClipped.getB2DPolygon(0);
-if (fGap != 0.0)
-moveLine(aPolygon, fGap, rVector);
-
return primitive2d::Primitive2DReference(
new
primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPolygon),
rColor));
}
@@ -183,9 +181,6 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
const basegfx::B2DPoint aTmpStart(getStart() - (fExt *
aVector));
const basegfx::B2DPoint aTmpEnd(getEnd() + (fExt *
aVector));
-// distance is already scaled.
-double fGap = mfDistance;
-
xRetval.realloc(2);
{
@@ -214,10 +209,10 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
getStart(), getEnd(), rViewInformation);
if (bIsHairline)
-xRetval[1] = makeHairLinePrimitive(getStart(),
getEnd(), aVector, aColor, fGap);
+xRetval[1] = makeHairLinePrimitive(getStart(),
getEnd(), aVector, aColor, mfDistance);
else
xRetval[1] = makeSolidLinePrimitive(
-aClipRegion, aTmpStart, aTmpEnd, aVector,
aColor, fWidth, fGap);
+aClipRegion, aTmpStart, aTmpEnd, aVector,
aColor, fWidth, mfDistance);
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/liborcus
external/liborcus/liborcus-handle-invalid-xml.patch.1 | 12 --
external/liborcus/liborcus_0.1.0-tac.patch| 20 --
2 files changed, 32 deletions(-)
New commits:
commit 9c6f0a676048bdbdf0b4866d5e5afd5a436b146e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Mar 4 06:47:55 2014 +0100
remove unnecessary patches
They have been applied upstream and are part of the new release.
Change-Id: I928b29e74abe2415bdf75de32cbaa7ac279a2889
diff --git a/external/liborcus/liborcus-handle-invalid-xml.patch.1
b/external/liborcus/liborcus-handle-invalid-xml.patch.1
deleted file mode 100644
index 4cb091d..000
--- a/external/liborcus/liborcus-handle-invalid-xml.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur liborcus.org/include/orcus/sax_parser.hpp
liborcus/include/orcus/sax_parser.hpp
liborcus.org/include/orcus/sax_parser.hpp 2013-12-13 20:51:55.126503773
+0100
-+++ liborcus/include/orcus/sax_parser.hpp 2013-12-13 20:57:39.076174743
+0100
-@@ -278,6 +278,8 @@
- special_tag();
- break;
- default:
-+if (!is_alpha(c))
-+throw malformed_xml_error(expect an alphabet.);
- element_open(pos);
- }
- }
diff --git a/external/liborcus/liborcus_0.1.0-tac.patch
b/external/liborcus/liborcus_0.1.0-tac.patch
deleted file mode 100644
index 01c77a9..000
--- a/external/liborcus/liborcus_0.1.0-tac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
configure
-+++ configure
-@@ -15668,7 +15668,7 @@
-
- LDFLAGS_SAVE=$LDFLAGS
- if test x$ax_boost_user_system_lib = x; then
--for libextension in `ls $BOOSTLIBDIR/libboost_system*.a*
$BOOSTLIBDIR/libboost_system*.so* 2/dev/null | sed 's,.*/,,' | sed -e
's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
-+for libextension in `ls $BOOSTLIBDIR/libboost_system*.a*
$BOOSTLIBDIR/libboost_system*.so* 2/dev/null | sed 's,.*/,,' | sed -e
's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tail -r` ; do
- ax_lib=${libextension}
- as_ac_Lib=`$as_echo
ac_cv_lib_$ax_lib''_exit | $as_tr_sh`
- { $as_echo $as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib 5
-@@ -15716,7 +15716,7 @@
-
- done
- if test x$link_system != xyes; then
--for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}*
2/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'
| tac` ; do
-+for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}*
2/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'
| tail -r` ; do
- ax_lib=${libextension}
- as_ac_Lib=`$as_echo
ac_cv_lib_$ax_lib''_exit | $as_tr_sh`
- { $as_echo $as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib 5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db247f2b9a804f3def54411615179df100c076d8 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Mar 4 06:54:49 2014 +0100 adapt the system orcus check to the new version Change-Id: I2447c10627b795ccb689b4758b55a7bb2ffa1094 diff --git a/configure.ac b/configure.ac index ed37a79..9284af5 100644 --- a/configure.ac +++ b/configure.ac @@ -8966,7 +8966,7 @@ if test -z $enable_orcus -o $enable_orcus != no; then ENABLE_ORCUS=TRUE AC_DEFINE(ENABLE_ORCUS) -libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.6 = 0.5.0]) +libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.8 = 0.7.0]) if test $with_system_orcus != yes; then if test $SYSTEM_BOOST = TRUE; then # === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: undefined reference to `xmlXPathNodeSetSort@LIBXML2_2.4.30 error while running 'make'
Hi Michael, thanks for the reply ! Here is the o/p for the three grep commands, and 'make l10ntools PARALLELISM=1 VERBOSE=t' sandeep@ubuntu:~/libreoffice$ grep LIBXML config_host.mk export LIBXML_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2 export LIBXML_JAR= export LIBXML_LIBS=$(gb_SPACE)-L/usr/local/lib -lxml2 export SYSTEM_LIBXML=TRUE sandeep@ubuntu:~/libreoffice$ grep LIBXSLT config_host.mk export LIBXSLT_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2 export LIBXSLT_LIBS=$(gb_SPACE)-L/usr/local/lib -lxslt -lxml2 export LIBXSLT_MAJOR= export SYSTEM_LIBXSLT=TRUE export SYSTEM_LIBXSLT_FOR_BUILD=TRUE sandeep@ubuntu:~/libreoffice$ grep LIBEXSLT config_host.mk export LIBEXSLT_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2 export LIBEXSLT_LIBS=$(gb_SPACE)-L/usr/local/lib -lexslt -lxslt -lxml2 sandeep@ubuntu:~/libreoffice$ make l10ntools PARALLELISM=1 VERBOSE=t cd /home/sandeep/libreoffice/l10ntools /usr/bin/make -j 1 -r [build PKG] icu make[1]: Entering directory `/home/sandeep/libreoffice/l10ntools' /home/sandeep/libreoffice/solenv/gbuild/Package.mk:81: *** Something depends on package icu which does not exist.. Stop. make[1]: Leaving directory `/home/sandeep/libreoffice/l10ntools' make: *** [l10ntools] Error 2 Thanks and regards, Sandeep. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-03-04
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam about module chart2, include, offapi, oox, xmloff + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar about module sw + sal: use posix_memalign only if it's available in https://gerrit.libreoffice.org/8405 from Douglas Mencken about module build, sal + [bug 39440] - cppcheck cleanlines - variable passed by reference in https://gerrit.libreoffice.org/8408 from Mihai Varga about module sc + fdo#74929 Chart grid is getting lost in https://gerrit.libreoffice.org/8159 from Priyanka Gaikwad about module chart2, oox + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam about module chart2, oox + fdo#75158 : Handled unsupported fields for docx file. in https://gerrit.libreoffice.org/8391 from Sushil Shinde about module odk, offapi, sw, writerfilter + Git: ignore autogen, doxygen and gdb config files in https://gerrit.libreoffice.org/8437 from Jan-Marek Glogowski about module build End of freshness + WIP Converted group by [number|date] pivot table dlg to .ui in https://gerrit.libreoffice.org/8382 from Katarina Behrens about module sc + fdo#60698: Split out slideshow code from animations in https://gerrit.libreoffice.org/8389 from Marcos Paulo de Souza about module animations, include, offapi, slideshow * Merged changes on master for project core changed in the last 25 hours: + fdo#54938: Convert some places to use cppu::supportsService in https://gerrit.libreoffice.org/8443 from Donizete Waterkemper + fdo#75538 R^2 calculation for trendline similar to LINEST function in https://gerrit.libreoffice.org/8402 from Laurent BP + Remove visual noise from sc in https://gerrit.libreoffice.org/8301 from Alexander Wilms + upgrade liborcus in https://gerrit.libreoffice.org/7310 from Markus Mohrhard + Translated German comments - find-german-comments clean now in https://gerrit.libreoffice.org/8409 from Luc Castermans + SVX : Remove usage of DBG_CTOR and DBG_DTOR. in https://gerrit.libreoffice.org/8419 from Arnaud Versini + SFX2 : Remove usage of DBG_CTOR and DBG_DTOR. in https://gerrit.libreoffice.org/8420 from Arnaud Versini + fdo#40513 PDF Import: Hack: Replace incorrect values of font's ascent pro in https://gerrit.libreoffice.org/8416 from Vort + SVTOOLS : Remove usage of DBG_CTOR and DBG_DTOR. in https://gerrit.libreoffice.org/8421 from Arnaud Versini + EXTENSIONS : Remove usage of DBG_CTOR and DBG_DTOR. in https://gerrit.libreoffice.org/8407 from Arnaud Versini + fdo#39468 Translate German Comments - vcl/source/window/seleng.cxx in https://gerrit.libreoffice.org/8429 from Christian M. Heller + fdo#39468 Translate German Comments - vcl/source/window/msgbox.cxx in https://gerrit.libreoffice.org/8428 from Christian M. Heller + fdo#39468 Translate German Comments - vcl/source/window/dlgctrl.cxx in https://gerrit.libreoffice.org/8427 from Christian M. Heller + fdo#74826: File corruption-Issue related to Series idx order val. in https://gerrit.libreoffice.org/8156 from Yogesh Bharate + Allow to build lpsolver based on CoinMP library. in https://gerrit.libreoffice.org/8434 from Matúš Kukan + fdo#60924: Autoinstall lpsolve package. in https://gerrit.libreoffice.org/8433 from Matúš Kukan + 118160: Use CoinMP as replacement for lp_solve. in https://gerrit.libreoffice.org/8432 from Matúš Kukan + Rename sccomp/source/solver/solver.cxx to solver-lpsolve.cxx in https://gerrit.libreoffice.org/8431 from Matúš Kukan + Add CoinMP external as an alternative to lpsolve. in https://gerrit.libreoffice.org/8383 from Matúš Kukan + fdo#72468 Remove memory overflow on static memory. in https://gerrit.libreoffice.org/7087 from Arnaud Versini * Abandoned changes on master for project core changed in the last 25 hours: + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + Translated German comments in https://gerrit.libreoffice.org/8406 from Luc Castermans * Open changes needing tweaks, but being untouched for more than a week: + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + fdo#74111 3D Rotation is wrong after Round trip for pie chart in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries
Re: [Libreoffice-qa] Please test (KDE Crasher)
On 03/03/2014 12:11 AM, Thomas Hackert wrote: be you should ask the reporter for a test document or a step-by-step description. Maybe he has done something really weird to crash LO ...;) I just opened my docx files, went to File – Save as..., selected ODF Text Document (.odt) and clicked the Save button ...;) And I have not set Use LibreOffice dialogs below Open/Save dialogs on Tools – Options – LibreOffice – General ...;) HTH +1 sounds like a plan. Thanks for testing! Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Metabug for Form Controls and docx export
As far as i see, LibreOffice still cannot export form control fields to a docx file, while it can export to doc format. There are some bug reports pointing specific form controls, like checkbox is missing when saving docx, text field is missing etc. LibreOffice cannot save any variations in current controls in docx :(. I made a sample file, no luck for any type of form control to save as docx. Form controls are very important in corporate usage, and such problem has a high priority for such users. And such bugs can really affect LO brand. Should we fill a meta bug for this issue? My experience is that devs don't find this to be incredibly helpful - let's see what they think on this as the point of meta bugs are to help developers fix things :) Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Please test (KDE Crasher)
Hello Joel, *, On Montag, 3. März 2014 17:07 Joel Madero wrote: On 03/03/2014 12:11 AM, Thomas Hackert wrote: be you should ask the reporter for a test document or a step-by-step description. Maybe he has done something really weird to crash LO ...;) I just opened my docx files, went to File – Save as..., selected ODF Text Document (.odt) and clicked the Save button ...;) And I have not set Use LibreOffice dialogs below Open/Save dialogs on Tools – Options – LibreOffice – General ...;) HTH +1 sounds like a plan. Thanks for testing! you are welcome :) Have a nice evening Thomas. -- You roll my log, and I will roll yours. -- Lucius Annaeus Seneca ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [MozTrap] Web Page Wizard suppresses most of the text from the community brochure
Hello @ll, as I was testing the Wizards in MozTrap wrt translation issues, I stumbled upon the following: 1. Download https://wiki.documentfoundation.org/File:LibreOfficeV.4.0.x-CommunityBrochure-GeneralInformation-A4.odt 2. Start LO 3. Click Enter without changing anything in the first dialog 4. Click Add... and choose the above mentioned file 5. Click Next, until you reach 4. Layout details 6. Choose Author, Creation date, Number of pages and 1024x768 7. Click Next 8. In 5. Styles, choose Blue Black as style, the topleft (space.jpg) as background image, and Cubic, 3D, Orange Blue as icon set 9. Click Next 10. Choose a title, description, enter your mail address, etc. 11. Click Next 12. Now click the ellipsis (...) behind To a local folder 13. Choose one (better, create a new folder to save the HTML site, pictures and the like ... ;) ). 14. Now open the freshly created index.html in your browser (I used FF 29.0a2 (2014-03-02) ) 15. Click on the link LibreOfficeV.4.0.x-CommunityBrochureTemplate- A4.odt On my system, I can only see the three top LibreOffice rectangles and three green bars above quote LibreOffice.org “The free office suite the community has been dreaming of for 12 years.” /quote ... :( Can someone confirm this? Webpage created with LO Version: 4.2.2.1 Build ID: 3be8cda0bddd8e430d8cda1ebfd581265cca5a0f and installed Germanophone lang- as well as helppack on Debian Testing i386, viewed with FF 29.0a2 (2014-03-02) Thanks for an answer in advance Thomas. -- God made machine language; all the rest is the work of man. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 75696] New: FORMATTING: Format Paintbrush does not work
https://bugs.freedesktop.org/show_bug.cgi?id=75696 Priority: medium Bug ID: 75696 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Format Paintbrush does not work Severity: normal Classification: Unclassified OS: All Reporter: duanpa...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.1.1 release Component: Writer Product: LibreOffice Problem description: Test Environment: Debian Wheezy 7.4, MS Windows XP Tested versions: 4.2.1.1 (bad) 4.2.0.2 (bad) 4.0.6 (bad) 3.5.4.2 (better but still with some inappropriateness) In my tests, most functions of Format Paintbrush in Writer 4.0.6 and above do not work. While it is better in 3.5.4.2, it also gave me many surprises, compared to MS Word 2003, especially when copying character attributes such as Italic or underline to default format text back and forth. The behaviors of Format Paintbrush is defined completely in the following document, isn't it? Page 180 to 183 of https://wiki.documentfoundation.org/images/a/ac/IG40-ImpressGuideLO.pdf Steps to reproduce: 1. Do some tests according to Table 6 and Table 7 in page 180 of the document mentioned above. Current behavior: Chaos! 1. Paragraph formats cannot be applied. 2. Only some character formats can be applied correctly, but not all are correct, for example, in some cases character format with small font size cannot be copied to the text with larger font size. Expected behavior: Paragraph formats and character formats can be copied correctly. NOTES What are the standard behaviors? Is there any document that defines the behaviors of Format Paintbrush in more detail? I am still not very clear about it. For example, should underline and Italic attributes be copied or not; what if we want to copy a normal character format without underline to text with underline? For this, Writer will give us a big surprise although we cannot say it is totally wrong! In MS Word, the related functions are more intuitive and clean. Should the behaviors in MS Word be the standard? I think MS Word does much better than LO now in this function. Detail standard can help us set up complete test cases. Once the standard is very clear, I think the programming logic should not be that hard and chaotic. Operating System: All Version: 4.2.1.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49485] Toolbar buttons allow opening multiple instances of dialogs
https://bugs.freedesktop.org/show_bug.cgi?id=49485 --- Comment #12 from Mike Lipscomb mclip...@gmail.com --- For what it's worth, I was the one who filed the original bug as it applied to WinXP SP3 and LO 3.6.x. This bug no longer appears with LO 4.2.x Writer on WinXP SP3. Just letting everyone know. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75696] FORMATTING: Format Paintbrush does not work
https://bugs.freedesktop.org/show_bug.cgi?id=75696 Ryan Duan duanpa...@gmail.com changed: What|Removed |Added Hardware|Other |All Severity|normal |major -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75696] FORMATTING: Format Paintbrush does not work
https://bugs.freedesktop.org/show_bug.cgi?id=75696 --- Comment #1 from Ryan Duan duanpa...@gmail.com --- It seems #57514 is a closely related bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75696] FORMATTING: Format Paintbrush does not work
https://bugs.freedesktop.org/show_bug.cgi?id=75696 --- Comment #2 from Ryan Duan duanpa...@gmail.com --- SORRY! I pasted the wrong URI of the document. It should be: https://wiki.documentfoundation.org/images/3/35/WG40-WriterGuideLO.pdf -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75437] libreoffice writer crashes when saving using KDE file dialogs
https://bugs.freedesktop.org/show_bug.cgi?id=75437 --- Comment #2 from thack...@nexgo.de --- Good morning Moritz, *, I cannot confirm your bug with LO Version: 4.1.5.3 Build ID: 1c1366bba2ba2b554cd2ca4d87c06da81c05d24 (parallel installed, following the instructions from https://wiki.documentfoundation.org/Installing_in_parallel) nor with my installed Version: 4.2.2.1 Build-ID: 3be8cda0bddd8e430d8cda1ebfd581265cca5a0f – both with installed Germanophone lang- as well as helppack under Debian Testing i386, sorry ... :( I have tested it with three different docx files: two private ones, one searched and downloaded from Bugzilla. I just opened them, went to File – Save as..., changed the file type to ODT, and clicked the Save button ... ;) I have also created a completely new document, entered a sentence, pressed CtrlY+S, chose a name for this file, changed the file type to Docx (2007/2010), but still no crash ... Have you done something completely different? Or would you be so kind to attach one of your problematic docx files to this bug, please? Then we others from QA could have a look on it, if there is something strange in it, what causes the crash ... ;) Sorry for the inconvenience and HTH Thomas. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75570] CONFIGURATION: Space oCheck on custom install preventing install of libreoffice.
https://bugs.freedesktop.org/show_bug.cgi?id=75570 --- Comment #2 from Steve sunnyday...@googlemail.com --- From what you have said and read in duplicate bug reports, and from what I have read on the internet, am I correct in thinking that this is a problem with MSI installer and that it cannot be bypassed? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75632] Impossibility to create a table with Autovalue primary key
https://bugs.freedesktop.org/show_bug.cgi?id=75632 --- Comment #2 from Desfontaine François francois.desfonta...@free.fr --- I use HSQLDB. The OS of my PC is Windows 7. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75467] FILEOPEN: Merely opening some .doc files modifies the original files.
https://bugs.freedesktop.org/show_bug.cgi?id=75467 --- Comment #7 from Jorendc jore...@libreoffice.org --- Mmh, I fail to reproduce the fact 'opening a file (either double click in Finder or open it via LibreOffice File Open) result in a bigger and changed file'. Tested using Mac OSX 10.9 with LibreOffice Version: 4.2.2.1 Build ID: 3be8cda0bddd8e430d8cda1ebfd581265cca5a0f @Ken: if you go to LibreOffice Preferences LibreOffice General Is the option 'Allow to save the document even when the document is not modified' checked? There are also some other interesting and maybe related options in Load/Save General. Does (un)selecting one of this options solve this behavior? Kind regards, Joren -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75559] LO crashes while opening a document containing bookmarks
https://bugs.freedesktop.org/show_bug.cgi?id=75559 --- Comment #3 from Sourav sourav.maha...@synerzip.com --- Build Id:-2f4db1cf6eaf28fc5907dca4870368ea4b67fbc0 I checked it on Ubuntu. Please find the attached gdbtrace.log for backtracing. I checked on Windows also with libo-master~2014-03-03_00.17.16_LibreOfficeDev_4.3.0.0.alpha0_Win_x86 and it is getting crashed. I have attached some more .docx files which are causing the crash. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75559] LO crashes while opening a document containing bookmarks
https://bugs.freedesktop.org/show_bug.cgi?id=75559 --- Comment #4 from Sourav sourav.maha...@synerzip.com --- Created attachment 95009 -- https://bugs.freedesktop.org/attachment.cgi?id=95009action=edit document contains bookmarks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75698] New: UI: the hide table boundaries in Writer command does not work anymore
https://bugs.freedesktop.org/show_bug.cgi?id=75698 Priority: medium Bug ID: 75698 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: the hide table boundaries in Writer command does not work anymore Severity: normal Classification: Unclassified OS: Windows (All) Reporter: silva...@katamail.com Hardware: Other Whiteboard: BSA PossibleRegression Status: UNCONFIRMED Version: 4.2.1.1 release Component: Writer Product: LibreOffice Problem description: when you create a table without borders, the command hide/show table boundaries of the table menu does not hide the gray lines showing them by default anymore; on the contrary, it adds to the table non existent black borders when switched to hide. This is annoying, since the ability to visualize the page as it will be printed when using tables without borders (for example when using a table to arrange contents position) is a really useful option. Even worse, if you switch to print preview, where the appearance should strictly be as on paper (regardless of the setting of the above switch), the non existent black borders always appear. Steps to reproduce: 1. open a new writer doc 2. create a table of any size, by default it will be without borders and with boundaries shown in light gray color 3. place the cursor anywhere in the table, and choose the command table boundaries in the table menu 4. Until 4.1 the table , as expected would become invisible; in 4.2.1 it shows non existent black borders 5. any further click on the table boundaries command switches from light gray to black boundaries, so that is it apparently impossible to see the page as it will be printed 6. now switch to print preview; the table will always have black borders while it should be invisible Expected behavior: when clicking on the table boundaries command of a table without borders, its boundaries should be invisible. Operating System: Windows 7 Version: 4.2.1.1 release Last worked in: 4.1.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75559] LO crashes while opening a document containing bookmarks
https://bugs.freedesktop.org/show_bug.cgi?id=75559 --- Comment #5 from Sourav sourav.maha...@synerzip.com --- Created attachment 95010 -- https://bugs.freedesktop.org/attachment.cgi?id=95010action=edit document contains bookmarks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75559] LO crashes while opening a document containing bookmarks
https://bugs.freedesktop.org/show_bug.cgi?id=75559 --- Comment #7 from Sourav sourav.maha...@synerzip.com --- Created attachment 95012 -- https://bugs.freedesktop.org/attachment.cgi?id=95012action=edit document contains bookmarks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75559] LO crashes while opening a document containing bookmarks
https://bugs.freedesktop.org/show_bug.cgi?id=75559 --- Comment #6 from Sourav sourav.maha...@synerzip.com --- Created attachment 95011 -- https://bugs.freedesktop.org/attachment.cgi?id=95011action=edit document contains bookmarks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75603] TABLE: Table textflow 0 not respected as continuation of numbering
https://bugs.freedesktop.org/show_bug.cgi?id=75603 --- Comment #2 from Maarten m.menhe...@gmail.com --- I expected 0 would continue the numbering as described here. See page number. https://help.libreoffice.org/Writer/Text_Flow_1 However I discovered something weird if I close the document and open it again the numbering does continue. I was doing this in the table options because I was under the impression that a ctrl+enter is the same as a manual page break from the menu insert. I was having trouble inserting a different page style in the middle of standard pages. Pressing the manual page break in the menu gives you a convenient box with options. I think this is the better way of achieving what I wanted. Here you can leave the page number blanco which is better imho but not consistent with the 0 used elsewhere. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75605] 4.2.1 double line cell borders print center line
https://bugs.freedesktop.org/show_bug.cgi?id=75605 Buzz toomanyb...@maildrop.cc changed: What|Removed |Added Component|Writer |Spreadsheet --- Comment #5 from Buzz toomanyb...@maildrop.cc --- I have reset this bug component from writer to spreadsheet. Apologies for the confusionBuzz -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75605] 4.2.1 double line cell borders print center line
https://bugs.freedesktop.org/show_bug.cgi?id=75605 Buzz toomanyb...@maildrop.cc changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75665] Calc/Spreadsheet, long multiline text in the cells, lagging - almost hanging when scrolling over sheet's content
https://bugs.freedesktop.org/show_bug.cgi?id=75665 8472 dv.underwo...@gmail.com changed: What|Removed |Added OS|All |Linux (All) --- Comment #3 from 8472 dv.underwo...@gmail.com --- Hi, Windows: Have tested it further, and Windows OS appears seems to be affected very little, if at all. I have one virtualized (VirtualBox) Win7 32bit (2CPU core and 1GB RAM) for such testing purposes. Have downloaded there portable LO 4.2.1, and opened the same example https://bugs.freedesktop.org/attachment.cgi?id=94957 file I provided here. The scrolling lagging has appeared very little, and if it did, I presume it was due to low RAM the VM has available. Thus no wonder, that you couldn't reproduce it on more powerful Win7 of yours. Linux: So it seems, that Linux LO installations are affected mostly. I checked your suggestions disabling Automatically checks spelling (which I found I had it disabled already anyway) or profile reset (stored in ~/.config/libreoffice/), but neither of these helped. My additional platform details I tested it with: - PC, Arch Linux 64bit, Dual core CPU 2.4GHz, 3GB RAM, (OpenBox VM), (latest LO ver. 4.2.1 installed via AUR libreoffice-rpm package) - Laptop, Arch Linux 64bit, Quad core CPU 2.5GHz, 8GB RAM, (OpenBox VM), (latest LO ver. 4.2.1 installed via AUR libreoffice-rpm package) - Laptop, Debian Linux 32bit, Dual core CPU 2GHz, 2GB RAM, (LXDE VM), (latest LO ver. 4.2.1 installed from official Debian package taken from homepage) - All of these have latest updates installed. Testing observations: - as was already said, disabling Automatically checks spelling doesn't seem to have any effect. - profile reset (stored in ~/.config/libreoffice/), even if I removed/renamed this whole directory, had either no effect. - when the LO app. window size is resized to smallest possible size, the problem ain't that critical, therefore make sure, that when testing it, you have e.g. maximized the LO app. window, this way the problem should show itself as reported (doesn't matter if it's laptop smaller display or larger e.g. 24 screen). Further confirmations from another Linux users would be great. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75700] New: FORMATTING: Printing double line borders in tables
https://bugs.freedesktop.org/show_bug.cgi?id=75700 Priority: medium Bug ID: 75700 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Printing double line borders in tables Severity: normal Classification: Unclassified OS: Windows (All) Reporter: brhengine...@gmail.com Hardware: Other Whiteboard: BSA PossibleRegression Status: UNCONFIRMED Version: 4.2.1.1 release Component: Writer Product: LibreOffice Created attachment 95014 -- https://bugs.freedesktop.org/attachment.cgi?id=95014action=edit Print out to PDFCreator which prints normally in previous versions. Problem description: Tables created in earlier versions with borders formatted with a double line do not print correctly Note: The same bug is present in Calc Steps to reproduce: 1. Create a table in an earlier version and format a border selecting a line style having two closely spaced parallel lines. 2. Print this and it should print correctly 3. Save the file, load it into version 4.2.1.1 and without any changes print it. Current behavior: The lines print with an offset to one side and much too widely spaced Expected behavior: The print out should appear the same in both versions Operating System: Windows 7 Version: 4.2.1.1 release Last worked in: 4.1.5.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
