LibreOffice Gerrit News for core on 2014-07-12
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ coinmp: macosx.build.patch
in https://gerrit.libreoffice.org/10227 from Robert Antoni Buj i Gelonch
about module external
+ l10ntools: fixes and improvements for transex3 executable
in https://gerrit.libreoffice.org/10212 from Douglas Mencken
about module l10ntools
+ fdo#80839: Different first page footer property is not preserved for foot
in https://gerrit.libreoffice.org/10232 from Yogesh Bharate
about module sw
+ fdo#78663 : The File gets corrupted when saved in LO
in https://gerrit.libreoffice.org/10229 from BisalNayal
about module filter, include, oox, sw
+ fdo#80902: Document grid type is not rendered properly
in https://gerrit.libreoffice.org/10224 from Priyanka Gaikwad
about module sw, writerfilter
+ fdo#79541 :Corrupt: Shape enclosed within a floating table
in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
about module sw, writerfilter
End of freshness
+ Improve header/footer UI label (fdo#81227)
in https://gerrit.libreoffice.org/10235 from Luke Deller
about module sw
+ fd0#80997: Fix for text missing which is behind textbox in RT.
in https://gerrit.libreoffice.org/10228 from Rohit Deshmukh
about module sw
+ fdo#80800 : DOCX: Preservation of Direct Formatting for non first Table C
in https://gerrit.libreoffice.org/10216 from Pallavi Jadhav
about module sw, writerfilter
* Merged changes on master for project core changed in the last 25 hours:
+ allow modern GCC to be automatically chosen on OS X 10.5
in https://gerrit.libreoffice.org/10118 from Douglas Mencken
+ nss/nspr: update build/autoconf/config.{guess,sub}
in https://gerrit.libreoffice.org/10148 from Robert Antoni Buj i Gelonch
+ Convert DLG_TEMPLATE_INFORMATION to .ui
in https://gerrit.libreoffice.org/10213 from Mihály Palenik
+ follow up fdo#81218 - update Copyright year in DEB files
in https://gerrit.libreoffice.org/10226 from Joren De Cuyper
+ avoid -arch for bundled OpenSSL, Python3, and nss/nspr on OSX@PowerPC
in https://gerrit.libreoffice.org/10117 from Douglas Mencken
+ Convert RID_CUI_DIALOG_COLORPICKER to .ui
in https://gerrit.libreoffice.org/10210 from Mihály Palenik
+ new loplugin: externalandnotdefined
in https://gerrit.libreoffice.org/9901 from Noel Grandin
+ VS2013: Make ADO backwards compatible for SDK > 8.0
in https://gerrit.libreoffice.org/10156 from David Ostrovsky
+ VS2013: Adjust lcms2 to 12.0 vcproj version
in https://gerrit.libreoffice.org/10157 from David Ostrovsky
+ VS2013: Adjust python3 to 12.0 vcproj version
in https://gerrit.libreoffice.org/10162 from David Ostrovsky
+ VS2013: Adjust libgltf to 12.0 vcproj version
in https://gerrit.libreoffice.org/10161 from David Ostrovsky
+ VS2013: Adjust glew to 12.0 vcproj version
in https://gerrit.libreoffice.org/10160 from David Ostrovsky
+ VS2013: Adjust cppunit to 12.0 vcproj version
in https://gerrit.libreoffice.org/10159 from David Ostrovsky
+ VS2013: Adjust coinmp to 12.0 vcproj version
in https://gerrit.libreoffice.org/10158 from David Ostrovsky
+ Check whether Command Args are already set up before doing so.
in https://gerrit.libreoffice.org/10222 from Andrzej Hunt
+ Introduce osl_areCommandArgsSet.
in https://gerrit.libreoffice.org/10221 from Andrzej Hunt
+ fdo#81218 - update Copyright year in DEB files
in https://gerrit.libreoffice.org/10223 from Joren De Cuyper
+ -Wdeprecated-declarations: first deprecated in OS X 10.10
in https://gerrit.libreoffice.org/10122 from Robert Antoni Buj i Gelonch
+ -Wdeprecated-declarations: first deprecated in OS X 10.10
in https://gerrit.libreoffice.org/10121 from Robert Antoni Buj i Gelonch
+ -Wdeprecated-declarations: first deprecated in OS X 10.10
in https://gerrit.libreoffice.org/10115 from Robert Antoni Buj i Gelonch
+ Convert RID_SCDLG_RETYPEPASS to .ui
in https://gerrit.libreoffice.org/10178 from Mihály Palenik
+ add UNO API loadStylesFromDocument
in https://gerrit.libreoffice.org/10214 from Laurent Godard
+ RID_SVX_XFORMS_TABPAGES conversion to .ui
in https://gerrit.libreoffice.org/10192 from Szymon Kłos
+ fdo#76279 Invalid Citation on RoundTrip
in https://gerrit.libreoffice.org/9898 from Sourav Mahajan
* Abandoned changes on master for project core changed in the last 25 hours:
+ Refactored swooxmlexport tests cases. Added function to check contents.
in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ sw/docx export: fix handling of document with header and section(s)
in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
* Open changes needing tweaks, but being untouched for more than a week:
+ attempt
in https://gerrit.libreoffice.org/9939 from Michael Stahl
+ fdo#78947 : The File gets corrupted when saved in LO
in https://gerrit.libreoffice.org/9775 from BisalNayal
+ move OpenGLContext to SAL
in https://gerrit.libreoffice.org/9429 from David
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Joel Madero changed: What|Removed |Added Depends on||81008 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #180 from Joel Madero --- Added bug 81008 - regression Serious data loss in a simple docx file. Bibisected with clear/easy reproducible steps. -- 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 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 tommy27 changed: What|Removed |Added Depends on||79761 --- Comment #2 from tommy27 --- I add Bug 79761 - autocorrect slow-down got worse working with large autocorrect lists in 4.4 master causes long freezes while you type. -- 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: libreofficekit/qa
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 64c77ac7c595cd018f167268e552ca8eded9fd57
Author: Andrzej Hunt
Date: Sat Jul 12 05:45:28 2014 +0200
GtkComboBoxText requires gtk >= 2.24.
Seeing as this is only a test program, probably easiest just to disable
this for gtk < 2.24, and rely on devs wanting to use it isntalling a new
enough gtk version.
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index b4ed50e..74661f1 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -117,6 +117,8 @@ void changeQuadView( GtkWidget* /*pButton*/, gpointer /*
pItem */ )
}
}
+// GtkComboBox requires gtk 2.24 or later
+#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION
> 2
void populatePartSelector( GtkComboBoxText* pSelector, LOKDocView* pView )
{
char sText[10];
@@ -140,6 +142,7 @@ void changePart( GtkWidget* pSelector, gpointer /* pItem */
)
lok_docview_set_part( LOK_DOCVIEW(pDocView), nPart );
}
}
+#endif
int main( int argc, char* argv[] )
{
@@ -188,11 +191,14 @@ int main( int argc, char* argv[] )
GtkToolItem* pSeparator1 = gtk_separator_tool_item_new();
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pSeparator1, -1);
+// GtkComboBox requires gtk 2.24 or later
+#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION
> 2
GtkToolItem* pPartSelectorToolItem = gtk_tool_item_new();
GtkWidget* pComboBox = gtk_combo_box_text_new();
gtk_container_add( GTK_CONTAINER(pPartSelectorToolItem), pComboBox );
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartSelectorToolItem, -1 );
g_signal_connect( G_OBJECT(pComboBox), "changed", G_CALLBACK(changePart),
NULL );
+#endif
GtkToolItem* pSeparator2 = gtk_separator_tool_item_new();
gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pSeparator2, -1);
@@ -213,7 +219,10 @@ int main( int argc, char* argv[] )
pFileName = argv[2];
lok_docview_open_document( LOK_DOCVIEW(pDocView), argv[2] );
+// GtkComboBox requires gtk 2.24 or later
+#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION
> 2
populatePartSelector( GTK_COMBO_BOX_TEXT(pComboBox), LOK_DOCVIEW(pDocView)
);
+#endif
gtk_main();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/impresstiledrendering' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 13 commits - desktop/source include/LibreOfficeKit include/sal include/vcl libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Executable_gtktile
desktop/source/lib/init.cxx | 54 ++
include/LibreOfficeKit/LibreOfficeKit.h |3
include/LibreOfficeKit/LibreOfficeKit.hxx | 11
include/LibreOfficeKit/LibreOfficeKitGtk.h |7
include/sal/log-areas.dox |5
include/vcl/ITiledRenderable.hxx| 16
libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk | 56 ++
libreofficekit/Executable_gtktiledviewer.mk |4
libreofficekit/Module_libreofficekit.mk |4
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 104
libreofficekit/qa/lokdocview_quad/lokdocview_quad.c | 256
libreofficekit/qa/lokdocview_quad/lokdocview_quad.h | 66 +++
libreofficekit/qa/unit/tiledrendering.cxx | 111 +
libreofficekit/source/gtk/lokdocview.c | 23 +
sc/inc/docuno.hxx |3
sc/source/ui/unoobj/docuno.cxx | 18
sd/source/ui/inc/unomodel.hxx | 18
sd/source/ui/unoidl/unomodel.cxx| 81 +++
sw/inc/unotxdoc.hxx |3
sw/source/uibase/uno/unotxdoc.cxx | 15
20 files changed, 838 insertions(+), 20 deletions(-)
New commits:
commit f9d3dbe549ae87c5799173e52d2d6a684dbfc55a
Author: Andrzej Hunt
Date: Fri Jul 11 16:21:15 2014 +0200
Impress: implement tiled rendering.
However we cannot as of yet select between rendering just the slide,
just the notes, or both combined -- this simply defaults to whatever
mode the document was last opened in for now.
Change-Id: Ia8ec0280aab75a36e430aa04c47cee4fea2db974
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 74133b8..f86e9cb 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -87,6 +87,7 @@
#include
#include "FrameView.hxx"
#include "ClientView.hxx"
+#include "DrawViewShell.hxx"
#include "ViewShell.hxx"
#include "app.hrc"
#include
@@ -108,6 +109,7 @@
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
+using namespace ::sd;
class SdUnoForbiddenCharsTable : public SvxUnoForbiddenCharsTable,
public SfxListener
@@ -2190,33 +2192,77 @@ void SdXImpressDocument::paintTile( VirtualDevice&
rDevice,
int nTilePosX, int nTilePosY,
long nTileWidth, long nTileHeight )
{
-(void) rDevice;
-(void) nOutputWidth;
-(void) nOutputHeight;
-(void) nTilePosX;
-(void) nTilePosY;
-(void) nTileWidth;
-(void) nTileHeight;
+// Scaling. Must convert from pixels to twips. We know
+// that VirtualDevices use a DPI of 96.
+// We specifically calculate these scales first as we're still
+// in TWIPs, and might as well minimise the number of conversions.
+Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440L) /
+Fraction( nTileWidth);
+Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440L) /
+Fraction( nTileHeight);
+
+// svx seems to be the only component that works natively in
+// 100th mm rather than TWIP. It makes most sense just to
+// convert here and in getDocumentSize, and leave the tiled
+// rendering API working in TWIPs.
+nTileWidth = convertTwipToMm100( nTileWidth );
+nTileHeight = convertTwipToMm100( nTileHeight );
+nTilePosX = convertTwipToMm100( nTilePosX );
+nTilePosY = convertTwipToMm100( nTilePosY );
+
+MapMode aMapMode = rDevice.GetMapMode();
+aMapMode.SetMapUnit( MAP_100TH_MM );
+aMapMode.SetOrigin( Point( -nTilePosX,
+ -nTilePosY) );
+aMapMode.SetScaleX( scaleX );
+aMapMode.SetScaleY( scaleY );
+
+rDevice.SetMapMode( aMapMode );
+
+rDevice.SetOutputSizePixel( Size(nOutputWidth, nOutputHeight) );
+mpDoc->GetDocSh()->GetViewShell()->GetView()->CompleteRedraw(
+&rDevice,
+Region(
+Rectangle( Point( nTilePosX, nTilePosY ),
+ Size( nTileWidth, nTileHeight ) ) ) );
+
+// TODO: Set page kind in frameview?
}
void SdXImpressDocument::setPart( int nPart )
{
-(void) nPart;
+DrawViewShell* pViewSh = dynamic_cast< DrawViewShell* >(
mpDoc->GetDocSh()->GetViewShell() );
+if (pViewSh)
+{
+pViewSh->SwitchPage( nPart );
+}
}
int SdXImpressDocument::getParts()
{
-return mpDoc->GetPageCount();
+// TODO: master pages?
+// Read: drviews1.cxx
+return mpDoc->GetSdPageCount(PK_STANDARD);
}
int SdXImpressDocument::getPart()
{
+DrawViewShell* pViewSh = dynamic_cast< DrawViewShell* >(
mpDoc->GetD
[Libreoffice-commits] core.git: external/collada2gltf
external/collada2gltf/UnpackedTarball_collada2gltf.mk |1
external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 | 18
++
2 files changed, 19 insertions(+)
New commits:
commit dfdc9f5ba4493369a0c6fb3a1d7c5781deeb5bc2
Author: Markus Mohrhard
Date: Sun Jul 6 15:08:43 2014 +0200
fix memory leak in collada2gltf
Change-Id: I7d4a00d94cf97e988847f11ded0de2dc0cb77828
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index def81f8..15a1a54 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
external/collada2gltf/patches/wrong_uri_usage.patch.1 \
external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 \
external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 \
+ external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1
b/external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1
new file mode 100644
index 000..81b4db8
--- /dev/null
+++ b/external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1
@@ -0,0 +1,18 @@
+diff -ur collada2gltf.org/COLLADA2GLTFWriter.cpp
collada2gltf/COLLADA2GLTFWriter.cpp
+--- collada2gltf.org/COLLADA2GLTFWriter.cpp2014-07-06 06:42:01.305850400
+0200
collada2gltf/COLLADA2GLTFWriter.cpp2014-07-06 06:45:57.000840753
+0200
+@@ -75,10 +75,13 @@
+
+ COLLADAFW::Root root(&this->_loader, this);
+
this->_loader.registerExtraDataCallbackHandler(this->_extraDataHandler);
+- if (!root.loadDocument(asset->getInputFilePath()))
++ if (!root.loadDocument(asset->getInputFilePath())) {
++delete _extraDataHandler;
+ return false;
++}
+
+ asset->write();
++delete _extraDataHandler;
+
+ return true;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx | 267 +++--
chart2/source/view/inc/GL3DBarChart.hxx| 20 +
chart2/source/view/main/OpenGLRender.cxx | 79 ---
chart2/source/view/main/OpenGLRender.hxx | 20 -
4 files changed, 184 insertions(+), 202 deletions(-)
New commits:
commit 664fb35ab522c40d298012922f059f6d48006355
Author: Markus Mohrhard
Date: Fri Jul 11 05:34:41 2014 +0200
first part for threaded chart rendering, fdo#81110
It is nor working correctly yet.
Change-Id: Ic592eb2f50265886ad6d97539d2c52d7c45179e6
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index f80ea99..8ce235f 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -23,6 +23,108 @@ using namespace com::sun::star;
namespace chart {
+const size_t STEPS = 200;
+
+class RenderThread : public salhelper::Thread
+{
+public:
+RenderThread(GL3DBarChart* pChart);
+
+protected:
+
+void renderFrame();
+GL3DBarChart* mpChart;
+};
+
+RenderThread::RenderThread(GL3DBarChart* pChart):
+salhelper::Thread("RenderThread"),
+mpChart(pChart)
+{
+}
+
+void RenderThread::renderFrame()
+{
+if(!mpChart->mbValidContext)
+return;
+
+mpChart->mrWindow.getContext().makeCurrent();
+Size aSize = mpChart->mrWindow.GetSizePixel();
+mpChart->mpRenderer->SetSize(aSize);
+if(mpChart->mbNeedsNewRender)
+{
+for(boost::ptr_vector::iterator itr =
mpChart->maShapes.begin(),
+itrEnd = mpChart->maShapes.end(); itr != itrEnd; ++itr)
+{
+itr->render();
+}
+}
+else
+{
+mpChart->mpCamera->render();
+}
+mpChart->mpRenderer->ProcessUnrenderedShape(mpChart->mbNeedsNewRender);
+mpChart->mbNeedsNewRender = false;
+mpChart->mrWindow.getContext().swapBuffers();
+
+}
+
+class RenderOneFrameThread : public RenderThread
+{
+public:
+RenderOneFrameThread(GL3DBarChart* pChart):
+RenderThread(pChart)
+{}
+
+protected:
+
+virtual void execute() SAL_OVERRIDE;
+};
+
+void RenderOneFrameThread::execute()
+{
+osl::MutexGuard aGuard(mpChart->maMutex);
+renderFrame();
+}
+
+class RenderAnimationThread : public RenderThread
+{
+public:
+RenderAnimationThread(GL3DBarChart* pChart, const glm::vec3& rStartPos,
const glm::vec3& rEndPos,
+const sal_Int32 nSteps = STEPS):
+RenderThread(pChart),
+maStartPos(rStartPos),
+maEndPos(rEndPos),
+mnSteps(nSteps)
+{
+}
+
+protected:
+
+virtual void execute() SAL_OVERRIDE;
+
+private:
+glm::vec3 maStartPos;
+glm::vec3 maEndPos;
+sal_Int32 mnSteps;
+
+};
+
+void RenderAnimationThread::execute()
+{
+osl::MutexGuard aGuard(mpChart->maMutex);
+glm::vec3 aStep = (maEndPos - maStartPos)/(float)mnSteps;
+for(sal_Int32 i = 0; i < mnSteps; ++i)
+{
+mpChart->maCameraPosition += aStep;
+mpChart->mpCamera->setPosition(mpChart->maCameraPosition);
+/*
+mpChart->maCameraDirection += mpChart->maStepDirection;
+mpChart->mpCamera->setDirection(mpChart->maCameraDirection);
+*/
+renderFrame();
+}
+}
+
GL3DBarChart::GL3DBarChart(
const css::uno::Reference& xChartType,
OpenGLWindow& rWindow) :
@@ -32,8 +134,6 @@ GL3DBarChart::GL3DBarChart(
mpCamera(NULL),
mbValidContext(true),
mpTextCache(new opengl3D::TextCache()),
-mnStep(0),
-mnStepsTotal(0),
mnMaxX(0),
mnMaxY(0),
mnDistance(0.0),
@@ -59,6 +159,9 @@ GL3DBarChart::BarInformation::BarInformation(const
glm::vec3& rPos, float nVal,
GL3DBarChart::~GL3DBarChart()
{
+if(mpRenderThread.is())
+mpRenderThread->join();
+osl::MutexGuard aGuard(maMutex);
if(mbValidContext)
mrWindow.setRenderer(NULL);
}
@@ -67,7 +170,6 @@ namespace {
const float TEXT_HEIGHT = 10.0f;
float DEFAULT_CAMERA_HEIGHT = 500.0f;
-const size_t STEPS = 200;
const sal_uLong TIMEOUT = 5;
const sal_uInt32 ID_STEP = 10;
@@ -108,6 +210,7 @@ double findMaxValue(const boost::ptr_vector&
rDataSeriesContainer)
void GL3DBarChart::create3DShapes(const boost::ptr_vector&
rDataSeriesContainer,
ExplicitCategoriesProvider& rCatProvider)
{
+osl::MutexGuard aGuard(maMutex);
mpRenderer->ReleaseShapes();
// Each series of data flows from left to right, and multiple series are
// stacked vertically along y axis.
@@ -297,35 +400,14 @@ void GL3DBarChart::create3DShapes(const
boost::ptr_vector& rDataSer
mbNeedsNewRender = true;
}
-void GL3DBarChart::render()
+void GL3DBarChart::update()
{
-if(!mbValidContext)
-return;
-
-mrWindow.getContext().makeCurrent();
+if(mpRenderThread.is())
+mpRenderThread->join();
Size aSize = mrWindow.GetSizePixel();
-mpRenderer->SetSize(aSize);
mrWindow.getContext().setWinSize(aSize
[Libreoffice-commits] mso-dumper.git: msodumper/xlsrecord.py
msodumper/xlsrecord.py | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 74da3c1eb42590856f286091b55ce13dd7c03fc3
Author: Kohei Yoshida
Date: Fri Jul 11 20:58:24 2014 -0400
Bit of cleanup.
diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py
index 81c42f1..b41be00 100644
--- a/msodumper/xlsrecord.py
+++ b/msodumper/xlsrecord.py
@@ -4229,6 +4229,7 @@ class RRDChgCell(BaseRecordHandler):
# TODO : Parse DXFN
return
+# old value
if self.vtOld == RRDChgCell.CellType.Blank:
pass
elif self.vtOld == RRDChgCell.CellType.RKNumber:
@@ -4241,10 +4242,8 @@ class RRDChgCell(BaseRecordHandler):
self.besOld = Bes(self)
elif self.vtOld == RRDChgCell.CellType.CellParsedFormula:
self.xpeOld = CellParsedFormula(self)
-else:
-# TODO : Handle other value types.
-return
+# new value
if self.vt == RRDChgCell.CellType.Blank:
pass
elif self.vt == RRDChgCell.CellType.RKNumber:
@@ -4257,9 +4256,6 @@ class RRDChgCell(BaseRecordHandler):
self.bes = Bes(self)
elif self.vt == RRDChgCell.CellType.CellParsedFormula:
self.xpe = CellParsedFormula(self)
-else:
-# TODO : Handle other value types.
-return
def parseBytes (self):
self.__parseBytes()
@@ -4285,6 +4281,7 @@ class RRDChgCell(BaseRecordHandler):
# TODO : Parse DXFN.
return
+# old value
if self.vtOld == RRDChgCell.CellType.Blank:
self.appendLine("old value: blank")
elif self.vtOld == RRDChgCell.CellType.RKNumber:
@@ -4297,9 +4294,8 @@ class RRDChgCell(BaseRecordHandler):
self.appendLineString("old value", self.besOld.toString())
elif self.vtOld == RRDChgCell.CellType.CellParsedFormula:
self.appendLineString("old value", self.xpeOld.toString())
-else:
-return
+# new value
if self.vt == RRDChgCell.CellType.Blank:
self.appendLine("new value: blank")
elif self.vt == RRDChgCell.CellType.RKNumber:
@@ -4312,8 +4308,6 @@ class RRDChgCell(BaseRecordHandler):
self.appendLineString("new value", self.bes.toString())
elif self.vt == RRDChgCell.CellType.CellParsedFormula:
self.appendLineString("new value", self.xpe.toString())
-else:
-return
class RRDInsDel(BaseRecordHandler):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: msodumper/xlsrecord.py
msodumper/xlsrecord.py | 95 +
1 file changed, 95 insertions(+)
New commits:
commit 15cd2bd8ff914a764bf0c6b5f0d39da5b58b2b03
Author: Kohei Yoshida
Date: Fri Jul 11 20:53:21 2014 -0400
Handle boolean, error, string, and formula values in cell change record.
Still for change tracking.
diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py
index 181a2a8..81c42f1 100644
--- a/msodumper/xlsrecord.py
+++ b/msodumper/xlsrecord.py
@@ -15,6 +15,46 @@ class RecordError(Exception): pass
# ---
# record handler classes
+class Bes(object):
+"""Boolean or error value"""
+
+ErrorValues = {
+0x00: "#NULL!",
+0x07: "#DIV/0!",
+0x0F: "#VALUE!",
+0x17: "#REF!",
+0x1D: "#NAME?",
+0x24: "#NUM!",
+0x2A: "#N/A",
+0x2B: "#GETTING_DATA"
+}
+
+def __init__ (self, strm):
+self.bBoolErr = strm.readUnsignedInt(1)
+self.fError = strm.readUnsignedInt(1) != 0
+
+def toString (self):
+if self.fError:
+return
"(error:%s)"%globals.getValueOrUnknown(Bes.ErrorValues,self.bBoolErr,"???")
+elif self.bBoolErr:
+return "(boolean:true)"
+else:
+return "(boolean:false)"
+
+
+class CellParsedFormula(object):
+
+def __init__ (self, strm):
+cce = strm.readUnsignedInt(2)
+bytes = strm.readBytes(cce)
+parser = formula.FormulaParser(strm.header, bytes)
+parser.parse()
+self.text = parser.getText()
+
+def toString (self):
+return self.text
+
+
class ColRelU(object):
def __init__ (self, strm):
@@ -417,6 +457,37 @@ Like parseBytes(), the derived classes must overwrite this
method."""
def readXLUnicodeStringNoCch (self, cch):
return self.readUnicodeString(cch)
+def readXLUnicodeRichExtendedString (self):
+cch = self.readUnsignedInt(2)
+flags = self.readUnsignedInt(1)
+fHighByte = (flags & 0x01) != 0 # double byte string
+fExtSt= (flags & 0x04) != 0 # phonetic string data
+fRichSt = (flags & 0x08) != 0 # rich text
+
+cRun = 0
+if fRichSt:
+cRun = self.readUnsignedInt(2) # number of elemetns in rgRun
+
+cbExtRst = 0
+if fExtSt:
+cbExtRst = self.readSignedInt(4) # byte count of ExtRst
+
+if fHighByte:
+rgb = unicode(self.readBytes(2*cch), 'UTF-16LE', errors='replace')
+elif globals.params.utf8:
+# Compressed Unicode-> latin1
+rgb = self.readBytes(cch).decode('cp1252')
+else:
+# Old behaviour with hex dump
+rgb = self.readBytes(cch)
+
+# optional FormatRun array. Ignore this for now.
+self.readBytes(cRun*4) # Each FormatRun is 4-byte long.
+
+# optional ExtRst. Ignore this for now.
+self.readBytes(cbExtRst)
+return rgb
+
def readLongRGB (self):
r = self.readUnsignedInt(1)
g = self.readUnsignedInt(1)
@@ -4164,6 +4235,12 @@ class RRDChgCell(BaseRecordHandler):
self.rkOld = decodeRK(self.readUnsignedInt(4))
elif self.vtOld == RRDChgCell.CellType.Xnum:
self.numOld = self.readDouble()
+elif self.vtOld == RRDChgCell.CellType.XLUnicodeRichExtendedString:
+self.stOld = self.readXLUnicodeRichExtendedString()
+elif self.vtOld == RRDChgCell.CellType.Bes:
+self.besOld = Bes(self)
+elif self.vtOld == RRDChgCell.CellType.CellParsedFormula:
+self.xpeOld = CellParsedFormula(self)
else:
# TODO : Handle other value types.
return
@@ -4174,6 +4251,12 @@ class RRDChgCell(BaseRecordHandler):
self.rk = decodeRK(self.readUnsignedInt(4))
elif self.vt == RRDChgCell.CellType.Xnum:
self.num = self.readDouble()
+elif self.vt == RRDChgCell.CellType.XLUnicodeRichExtendedString:
+self.st = self.readXLUnicodeRichExtendedString()
+elif self.vt == RRDChgCell.CellType.Bes:
+self.bes = Bes(self)
+elif self.vt == RRDChgCell.CellType.CellParsedFormula:
+self.xpe = CellParsedFormula(self)
else:
# TODO : Handle other value types.
return
@@ -4208,6 +4291,12 @@ class RRDChgCell(BaseRecordHandler):
self.appendLine("old value: %g"%self.rkOld)
elif self.vtOld == RRDChgCell.CellType.Xnum:
self.appendLine("old value: %g"%self.numOld)
+elif self.vtOld == RRDChgCell.CellType.XLUnicodeRichExtendedString:
+self.appendLineString("old value", self.stOld)
+elif self.vtOld == RRDChgCell.CellType.Bes:
+self.appendLineString("old value", self.besOld.toString())
+elif self.vtOld == RRDChgCell.CellType.CellParsedFormula:
+self.appendLineStrin
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotextdecomposition.cxx | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 99466aa1d749a822758d38f7b7b6c38c61b24744
Author: matteocam
Date: Sat Jul 12 01:39:40 2014 +0200
Created impHandleTruncatedPortion
Change-Id: Iad36d1d0887761cec72cb1890be329778358e49f
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index e044d39..510652a 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -523,16 +523,11 @@ namespace
bool bTruncateText = rInfo.mbEndOfParagraph; // arbitrary property
+// truncate text
if ( bTruncateText )
-{
-// truncate it at 4
-int nTruncationPoint = 4;
-rInfo.mnTextLen = std::min( rInfo.mnTextLen, nTruncationPoint );
-}
-
-// END FIXME
-
-impCreateTextPortionPrimitive(rInfo);
+impHandleTruncatedPortion(rInfo)
+else // no chaining or truncating
+impCreateTextPortionPrimitive(rInfo);
if(rInfo.mbEndOfLine || rInfo.mbEndOfParagraph)
{
@@ -545,6 +540,15 @@ namespace
}
}
+void impTextBreakupHandler::impHandleTruncatedPortion(const
DrawPortionInfo& rInfo)
+{
+// truncate it at 4
+int nTruncationPoint = 4;
+DrawPortionInfo rInfoNonConst = rInfo;
+rInfoNonConst.mnTextLen = std::min( rInfo.mnTextLen, nTruncationPoint
);
+impCreateTextPortionPrimitive(rInfoNonConst);
+}
+
void impTextBreakupHandler::impHandleDrawBulletInfo(const DrawBulletInfo&
rInfo)
{
basegfx::B2DHomMatrix aNewTransform;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: msodumper/xlsrecord.py msodumper/xlsstream.py
msodumper/xlsrecord.py | 318 ++---
msodumper/xlsstream.py |4
2 files changed, 228 insertions(+), 94 deletions(-)
New commits:
commit ff0dc534560702f5af16a1a15f368f6c6e083d54
Author: Kohei Yoshida
Date: Fri Jul 11 18:51:21 2014 -0400
Handle change cell and ins/del rows/columns records in change tracking.
The change cell record is a redo of my previous handler code, to get
more details. This is still work-in-progress.
diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py
index 463e783..181a2a8 100644
--- a/msodumper/xlsrecord.py
+++ b/msodumper/xlsrecord.py
@@ -15,6 +15,32 @@ class RecordError(Exception): pass
# ---
# record handler classes
+class ColRelU(object):
+
+def __init__ (self, strm):
+self.col = strm.readUnsignedInt(2)
+self.colRelative = (self.col & 0x4000) != 0
+self.rowRelative = (self.col & 0x8000) != 0
+self.col = self.col & 0x3FFF
+
+
+class RgceLoc(object):
+
+def __init__ (self, strm):
+self.row = strm.readUnsignedInt(2)
+self.column = ColRelU(strm)
+
+def toString (self):
+s = ''
+if not self.column.colRelative:
+s += '$'
+s += formula.toColName(self.column.col)
+if not self.column.rowRelative:
+s += '$'
+s += "%d"%(self.row+1)
+return s
+
+
class Ref8(object):
def __init__ (self, strm):
@@ -58,6 +84,14 @@ class Ref8U(object):
self.col1 = strm.readUnsignedInt(2)
self.col2 = strm.readUnsignedInt(2)
+def toString (self):
+rge = formula.CellRange()
+rge.firstRow = self.row1
+rge.firstCol = self.col1
+rge.lastRow = self.row2
+rge.lastCol = self.col2
+return rge.toString()
+
class RKAuxData(object):
"""Store auxiliary data for RK value"""
@@ -4010,100 +4044,200 @@ class SXRng(BaseRecordHandler):
# ---
# CT - Change Tracking
-class CTCellContent(BaseRecordHandler):
-
-EXC_CHTR_TYPE_MASK = 0x0007
-EXC_CHTR_TYPE_FORMATMASK = 0xFF00
-EXC_CHTR_TYPE_EMPTY = 0x
-EXC_CHTR_TYPE_RK = 0x0001
-EXC_CHTR_TYPE_DOUBLE = 0x0002
-EXC_CHTR_TYPE_STRING = 0x0003
-EXC_CHTR_TYPE_BOOL = 0x0004
-EXC_CHTR_TYPE_FORMULA= 0x0005
-
-def parseBytes (self):
-size = globals.getSignedInt(self.readBytes(4))
-id = globals.getSignedInt(self.readBytes(4))
-opcode = globals.getSignedInt(self.readBytes(2))
-accept = globals.getSignedInt(self.readBytes(2))
-tabCreateId = globals.getSignedInt(self.readBytes(2))
-valueType = globals.getSignedInt(self.readBytes(2))
-self.appendLine("header: (size=%d; index=%d; opcode=0x%2.2X;
accept=%d)"%(size, id, opcode, accept))
-self.appendLine("sheet creation id: %d"%tabCreateId)
-
-oldType = (valueType/(2*2*2) & CTCellContent.EXC_CHTR_TYPE_MASK)
-newType = (valueType & CTCellContent.EXC_CHTR_TYPE_MASK)
-self.appendLine("value type: (old=%4.4Xh; new=%4.4Xh)"%(oldType,
newType))
-self.readBytes(2) # ignore next 2 bytes.
-
-row = globals.getSignedInt(self.readBytes(2))
-col = globals.getSignedInt(self.readBytes(2))
-cell = formula.CellAddress(col, row)
-self.appendLine("cell position: %s"%cell.getName())
-
-oldSize = globals.getSignedInt(self.readBytes(2))
-self.readBytes(4) # ignore 4 bytes.
-
-fmtType = (valueType & CTCellContent.EXC_CHTR_TYPE_FORMATMASK)
-if fmtType == 0x1100:
-self.readBytes(16)
-elif fmtType == 0x1300:
-self.readBytes(8)
-
-self.readCell(oldType, "old cell type")
-self.readCell(newType, "new cell type")
-
-def readCell (self, cellType, cellName):
-
-cellTypeText = 'unknown'
-
-if cellType == CTCellContent.EXC_CHTR_TYPE_FORMULA:
-cellTypeText, formulaBytes, formulaText = self.readFormula()
-self.appendLine("%s: %s"%(cellName, cellTypeText))
-self.appendLine("formula bytes:
%s"%globals.getRawBytes(formulaBytes, True, False))
-self.appendLine("tokens: %s"%formulaText)
+class RRD(object):
+
+RevType = {
+0x: "insert row", # REVTINSRW
+0x0001: "insert column", # REVTINSCOL
+0x0002: "delete row", # REVTDELRW
+0x0003: "delete column", # REVTDELCOL
+0x0004: "cell move", # REVTMOVE
+0x0005: "insert sheet",# REVTINSERTSH
+0x0007: "sort",# REVTSORT
+0x0008: "cell change", # REVTCHANGECELL
+0x0009: "rename sheet",# REVTRENSHEET
+0x000A: "defined name change", # REVTDE
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/component_context.cxx |8 +++-
cppuhelper/source/interfacecontainer.cxx | 13 +++
cppuhelper/source/propshlp.cxx | 51 +++
3 files changed, 22 insertions(+), 50 deletions(-)
New commits:
commit ef9449cd04748320ee45242feb53805eef07d44c
Author: Takeshi Abe
Date: Fri Jul 11 14:23:50 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: I5e302cf7ac784e1413c0539d0c967a3523f04ba0
diff --git a/cppuhelper/source/component_context.cxx
b/cppuhelper/source/component_context.cxx
index dc8944a..16642e9 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -54,6 +54,8 @@
#include
#include
+#include
+
#define SMGR_SINGLETON "/singletons/com.sun.star.lang.theServiceManager"
#define TDMGR_SINGLETON
"/singletons/com.sun.star.reflection.theTypeDescriptionManager"
#define AC_SINGLETON "/singletons/com.sun.star.security.theAccessController"
@@ -844,7 +846,7 @@ Reference< XComponentContext > SAL_CALL
createComponentContext(
uno::Mapping curr2source(curr_env, source_env);
uno::Mapping source2curr(source_env, curr_env);
-ContextEntry_Init * mapped_entries = new ContextEntry_Init[nEntries];
+boost::scoped_array mapped_entries(new
ContextEntry_Init[nEntries]);
for (sal_Int32 nPos = 0; nPos < nEntries; ++ nPos)
{
mapped_entries[nPos].bLateInitService =
pEntries[nPos].bLateInitService;
@@ -858,8 +860,8 @@ Reference< XComponentContext > SAL_CALL
createComponentContext(
void * mapped_delegate = curr2source.mapInterface(xDelegate.get(),
::getCppuType(&xDelegate));
XComponentContext * pXComponentContext = NULL;
-source_env.invoke(s_createComponentContext_v, mapped_entries, nEntries,
mapped_delegate, &pXComponentContext, &source2curr);
-delete[] mapped_entries;
+source_env.invoke(s_createComponentContext_v, mapped_entries.get(),
nEntries, mapped_delegate, &pXComponentContext, &source2curr);
+mapped_entries.reset();
return Reference(pXComponentContext, SAL_NO_ACQUIRE);
}
diff --git a/cppuhelper/source/interfacecontainer.cxx
b/cppuhelper/source/interfacecontainer.cxx
index 22f090b..0a0e251 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include
@@ -455,7 +456,7 @@ sal_Int32
OMultiTypeInterfaceContainerHelper::removeInterface(
void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject &
rEvt )
{
t_type2ptr::size_type nSize = 0;
-OInterfaceContainerHelper ** ppListenerContainers = NULL;
+boost::scoped_array ppListenerContainers;
{
::osl::MutexGuard aGuard( rMutex );
t_type2ptr * pMap = (t_type2ptr *)m_pMap;
@@ -463,7 +464,7 @@ void OMultiTypeInterfaceContainerHelper::disposeAndClear(
const EventObject & rE
if( nSize )
{
typedef OInterfaceContainerHelper* ppp;
-ppListenerContainers = new ppp[nSize];
+ppListenerContainers.reset(new ppp[nSize]);
//ppListenerContainers = new (ListenerContainer*)[nSize];
t_type2ptr::iterator iter = pMap->begin();
@@ -485,8 +486,6 @@ void OMultiTypeInterfaceContainerHelper::disposeAndClear(
const EventObject & rE
if( ppListenerContainers[i] )
ppListenerContainers[i]->disposeAndClear( rEvt );
}
-
-delete [] ppListenerContainers;
}
void OMultiTypeInterfaceContainerHelper::clear()
@@ -631,7 +630,7 @@ sal_Int32
OMultiTypeInterfaceContainerHelperInt32::removeInterface(
void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const
EventObject & rEvt )
{
t_long2ptr::size_type nSize = 0;
-OInterfaceContainerHelper ** ppListenerContainers = NULL;
+boost::scoped_array ppListenerContainers;
{
::osl::MutexGuard aGuard( rMutex );
if (!m_pMap)
@@ -642,7 +641,7 @@ void
OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
if( nSize )
{
typedef OInterfaceContainerHelper* ppp;
-ppListenerContainers = new ppp[nSize];
+ppListenerContainers.reset(new ppp[nSize]);
t_long2ptr::iterator iter = pMap->begin();
t_long2ptr::iterator end = pMap->end();
@@ -663,8 +662,6 @@ void
OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
if( ppListenerContainers[i] )
ppListenerContainers[i]->disposeAndClear( rEvt );
}
-
-delete [] ppListenerContainers;
}
void OMultiTypeInterfaceContainerHelperInt32::clear()
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 903b222..94500ba 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -25,7 +25,7 @@
#include
#include
#include
-
+#include
using namespace osl;
using namespace com::sun::star::u
[ANN] LIbreOffice 4.2.6 RC1 available
Dear Community, The Document Foundation is pleased to announce the first release candidate of LibreOffice 4.2.6. The upcoming 4.2.6 will be the sixth in a sequence of frequent bugfix releases for our feature-packed 4.2 line. Feel free to give it a try instead of 4.2.5. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.6 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.6/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 67576, which changed state. Bug 67576 Summary: setting printing page size in File->Print requires clicking new "Use only paper size from printer preferences" checkbox https://bugs.freedesktop.org/show_bug.cgi?id=67576 What|Removed |Added Status|RESOLVED|REOPENED Resolution|NOTABUG |--- -- 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: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 18258eb811d1b8ad10810925952b8e32228128c5 Author: Michael Stahl Date: Fri Jul 11 21:54:03 2014 +0200 gbuild: always prepend our stuff to PATH on Windows Who knows what weird conflicting stuff could be on PATH. Change-Id: I5acec89687efe736ecc1f970eb56efa22393b251 diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index f5dc496..eaae642 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -295,14 +295,14 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL) # Helper class ifeq ($(GNUMAKE_WIN_NATIVE),TRUE) -gb_Helper_set_ld_path := PATH="$$PATH;$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER))" +gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER));$$PATH" define gb_Helper_prepend_ld_path PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER));$(1);$$PATH" endef else -gb_Helper_set_ld_path := PATH="$$PATH:$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR)/$(LIBO_BIN_FOLDER))" +gb_Helper_set_ld_path := PATH="$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR)/$(LIBO_BIN_FOLDER)):$$PATH" define gb_Helper_prepend_ld_path PATH="$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR)/$(LIBO_BIN_FOLDER)):$(1):$$PATH" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit db0a4c2575ffba1c170d74882b0f5a6229ec072f
Author: Eike Rathke
Date: Fri Jul 11 23:15:50 2014 +0200
resolved fdo#77018 keep external references intact during sort
Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to
work.
Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8f8fe84..7394799 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -522,6 +522,9 @@ bool ScToken::Is3DRef() const
if ( GetSingleRef().IsFlag3D() )
return true;
break;
+case svExternalSingleRef:
+case svExternalDoubleRef:
+return true;
default:
{
// added to avoid warnings
@@ -2236,6 +2239,20 @@ void ScTokenArray::ReadjustRelative3DReferences( const
ScAddress& rOldPos,
}
}
break;
+case svExternalDoubleRef :
+{
+ScSingleRefData& rRef2 =
static_cast(pCode[j])->GetSingleRef2();
+ScAddress aAbs = rRef2.toAbs(rOldPos);
+rRef2.SetAddress(aAbs, rNewPos);
+}
+//! fallthru
+case svExternalSingleRef :
+{
+ScSingleRefData& rRef1 =
static_cast(pCode[j])->GetSingleRef();
+ScAddress aAbs = rRef1.toAbs(rOldPos);
+rRef1.SetAddress(aAbs, rNewPos);
+}
+break;
default:
{
// added to avoid warnings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'test/for/libreoffice-4-2'
New branch 'test/for/libreoffice-4-2' available with the following commits: commit d41228e5ba98be7270a3352cddcd1d860c698e8b Author: Michael Meeks Date: Fri Jul 11 20:49:33 2014 +0100 fdo#81214 - tolerate exceptions thrown inside XFastParser callbacks. Not an ideal solution; ideally we should not throw the exceptions, and stop the parser as soon as something bad like this happens; but hopefully exception throwing is reasonable exceptional. Change-Id: If619592533b2929c671e2b03eb8a83480bd92c54 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/fastparser/fastparser.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 9af1cbf233620e7c9d3fa9d8f55ab0e05dca6c84
Author: Michael Meeks
Date: Fri Jul 11 20:49:33 2014 +0100
fdo#81214 - tolerate exceptions thrown inside XFastParser callbacks.
Not an ideal solution; ideally we should not throw the exceptions,
and stop the parser as soon as something bad like this happens; but
hopefully exception throwing is reasonable exceptional.
Change-Id: If619592533b2929c671e2b03eb8a83480bd92c54
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 17e0213..d3103d1 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -607,12 +607,11 @@ void Entity::throwException( const ::rtl::Reference<
FastLocatorImpl > &xDocumen
// the consuming thread.
void Entity::saveException( const Exception &e )
{
-// only store the first exception
-if( !maSavedException.hasValue() )
-{
-maSavedException <<= e;
-XML_StopParser( mpParser, /* resumable? */ XML_FALSE );
-}
+// fdo#81214 - allow the parser to run on after an exception,
+// unexpectedly some 'startElements' produce an UNO_QUERY_THROW
+// for XComponent; and yet expect to continue parsing.
+SAL_WARN("sax", "Unexpected exception from XML parser " << e.Message);
+maSavedException <<= e;
}
} // namespace
___
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 Bug 65675 depends on bug 81214, which changed state. Bug 81214 Summary: FILEOPEN: DOCX: Unable to import text after missing formula in footnotes https://bugs.freedesktop.org/show_bug.cgi?id=81214 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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: Branch 'libreoffice-4-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cada4e8b903de7dc02d10608c749214a8a07b5e8 Author: Andras Timar Date: Fri Jul 11 20:31:18 2014 +0200 Updated core Project: translations 1fd41602a46dfa2fd41a9a0d86c948d31949e5d8 diff --git a/translations b/translations index 049fa97..1fd4160 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 049fa97ac9b779233fa4c004345698812955447c +Subproject commit 1fd41602a46dfa2fd41a9a0d86c948d31949e5d8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-3' - source/sl
source/sl/cui/source/tabpages.po| 10 source/sl/cui/uiconfig/ui.po| 11 source/sl/svtools/uiconfig/ui.po|4 - source/sl/svx/source/dialog.po | 86 ++-- source/sl/sw/uiconfig/swriter/ui.po | 36 +++ 5 files changed, 96 insertions(+), 51 deletions(-) New commits: commit 1fd41602a46dfa2fd41a9a0d86c948d31949e5d8 Author: Andras Timar Date: Fri Jul 11 20:31:18 2014 +0200 Updated Slovenian translation Change-Id: Id73bb2214c2d06496064cdcd728cd87e1f070976 diff --git a/source/sl/cui/source/tabpages.po b/source/sl/cui/source/tabpages.po index b51cbf8..a9f7cab 100644 --- a/source/sl/cui/source/tabpages.po +++ b/source/sl/cui/source/tabpages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-05-31 09:42+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" "PO-Revision-Date: 2014-05-31 00:21+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" @@ -1137,11 +1137,3 @@ msgctxt "" "string.text" msgid "Dimension line" msgstr "Kotirna Ärta" - -#: strings.src -msgctxt "" -"strings.src\n" -"RID_SVXSTR_READ_DATA_ERROR\n" -"string.text" -msgid "The file could not be loaded!" -msgstr "Datoteke ni mogoÄe naložiti!" diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po index b458a95..11dd03d 100644 --- a/source/sl/cui/uiconfig/ui.po +++ b/source/sl/cui/uiconfig/ui.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-06-12 17:30+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" "PO-Revision-Date: 2014-06-08 11:35+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" @@ -938,15 +938,6 @@ msgstr "Odmik" #: areatabpage.ui msgctxt "" "areatabpage.ui\n" -"btnimport\n" -"label\n" -"string.text" -msgid "Import Graphic..." -msgstr "Uvozi sliko ..." - -#: areatabpage.ui -msgctxt "" -"areatabpage.ui\n" "liststoreLB_AREA_TYPE\n" "0\n" "stringlist.text" diff --git a/source/sl/svtools/uiconfig/ui.po b/source/sl/svtools/uiconfig/ui.po index ea5d6b3..749d84b 100644 --- a/source/sl/svtools/uiconfig/ui.po +++ b/source/sl/svtools/uiconfig/ui.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-06-29 18:23+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" "PO-Revision-Date: 2014-06-29 21:28+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" diff --git a/source/sl/svx/source/dialog.po b/source/sl/svx/source/dialog.po index de49ec4..180f830 100644 --- a/source/sl/svx/source/dialog.po +++ b/source/sl/svx/source/dialog.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-06-12 17:30+0200\n" -"PO-Revision-Date: 2014-06-08 11:33+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" +"PO-Revision-Date: 2014-07-11 16:47+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" @@ -152,6 +152,86 @@ msgctxt "" msgid "$(CAPACITY) kiB" msgstr "$(CAPACITY) kB" +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_GIF\n" +"string.text" +msgid "Gif image" +msgstr "Slika GIF" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_JPEG\n" +"string.text" +msgid "Jpeg image" +msgstr "Slika JPEG" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_PNG\n" +"string.text" +msgid "PNG image" +msgstr "Slika PNG" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_TIFF\n" +"string.text" +msgid "TIFF image" +msgstr "Slika TIFF" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_WMF\n" +"string.text" +msgid "WMF image"
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-3-0' - source/sl
source/sl/cui/source/tabpages.po| 10 source/sl/cui/uiconfig/ui.po| 11 source/sl/svtools/uiconfig/ui.po|4 - source/sl/svx/source/dialog.po | 86 ++-- source/sl/sw/uiconfig/swriter/ui.po | 36 +++ 5 files changed, 96 insertions(+), 51 deletions(-) New commits: commit c89c33a215f26d0e4e03f75268ef07a31e166f01 Author: Andras Timar Date: Fri Jul 11 20:28:55 2014 +0200 . Change-Id: I7fda16e2b8cd6f81ed9855527092dffef2b3adc4 diff --git a/source/sl/cui/source/tabpages.po b/source/sl/cui/source/tabpages.po index b51cbf8..a9f7cab 100644 --- a/source/sl/cui/source/tabpages.po +++ b/source/sl/cui/source/tabpages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-05-31 09:42+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" "PO-Revision-Date: 2014-05-31 00:21+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" @@ -1137,11 +1137,3 @@ msgctxt "" "string.text" msgid "Dimension line" msgstr "Kotirna Ärta" - -#: strings.src -msgctxt "" -"strings.src\n" -"RID_SVXSTR_READ_DATA_ERROR\n" -"string.text" -msgid "The file could not be loaded!" -msgstr "Datoteke ni mogoÄe naložiti!" diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po index b458a95..11dd03d 100644 --- a/source/sl/cui/uiconfig/ui.po +++ b/source/sl/cui/uiconfig/ui.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-06-12 17:30+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" "PO-Revision-Date: 2014-06-08 11:35+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" @@ -938,15 +938,6 @@ msgstr "Odmik" #: areatabpage.ui msgctxt "" "areatabpage.ui\n" -"btnimport\n" -"label\n" -"string.text" -msgid "Import Graphic..." -msgstr "Uvozi sliko ..." - -#: areatabpage.ui -msgctxt "" -"areatabpage.ui\n" "liststoreLB_AREA_TYPE\n" "0\n" "stringlist.text" diff --git a/source/sl/svtools/uiconfig/ui.po b/source/sl/svtools/uiconfig/ui.po index ea5d6b3..749d84b 100644 --- a/source/sl/svtools/uiconfig/ui.po +++ b/source/sl/svtools/uiconfig/ui.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-06-29 18:23+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" "PO-Revision-Date: 2014-06-29 21:28+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" diff --git a/source/sl/svx/source/dialog.po b/source/sl/svx/source/dialog.po index de49ec4..180f830 100644 --- a/source/sl/svx/source/dialog.po +++ b/source/sl/svx/source/dialog.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2014-06-12 17:30+0200\n" -"PO-Revision-Date: 2014-06-08 11:33+0200\n" +"POT-Creation-Date: 2014-07-11 13:43+0200\n" +"PO-Revision-Date: 2014-07-11 16:47+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" @@ -152,6 +152,86 @@ msgctxt "" msgid "$(CAPACITY) kiB" msgstr "$(CAPACITY) kB" +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_GIF\n" +"string.text" +msgid "Gif image" +msgstr "Slika GIF" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_JPEG\n" +"string.text" +msgid "Jpeg image" +msgstr "Slika JPEG" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_PNG\n" +"string.text" +msgid "PNG image" +msgstr "Slika PNG" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_TIFF\n" +"string.text" +msgid "TIFF image" +msgstr "Slika TIFF" + +#: compressgraphicdialog.src +msgctxt "" +"compressgraphicdialog.src\n" +"STR_IMAGE_WMF\n" +"string.text" +msgid "WMF image" +msgstr "Slika WMF" + +#: co
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b66d0a958880d45c2fa81592af4e61946f9425e0 Author: Andras Timar Date: Fri Jul 11 20:28:55 2014 +0200 Updated core Project: translations c89c33a215f26d0e4e03f75268ef07a31e166f01 diff --git a/translations b/translations index 28d2091..c89c33a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 28d209144a1c40052e83002649aba3ee5f100719 +Subproject commit c89c33a215f26d0e4e03f75268ef07a31e166f01 ___ 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 Bug 65675 depends on bug 79441, which changed state. Bug 79441 Summary: Internal references to other sheets not sorted https://bugs.freedesktop.org/show_bug.cgi?id=79441 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 79441, which changed state. Bug 79441 Summary: Internal references to other sheets not sorted https://bugs.freedesktop.org/show_bug.cgi?id=79441 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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
Re: minutes of ESC call ...
Jan-Marek Glogowski wrote > Times are: > 500 | 3:20 > 750 | 8:10 > 1000 | 17:15 > 1500 | 56:50 > 1750 | 92:20 Hi! Back in the days (LO 3.5.6) we had the same problem using the xls file as data source. It took xx minutes every time to get few docs generated from the list. All ended when instead of using Wizard directly we used File>Print approach. Generating few files was pretty much instant and the interface is better to use by our users than the Wizard (select records, save to file, select naming etc.). I checked your files from the bug and on my slow disk laptop writing directly to separate odt files per each record took (using 4.3.0RC1): - 500 files - ~3:00 - 1000 - ~10:00 - 1500 - ~17:00 and so on... All this is at constant 1000 files in 10 minutes ratio. System is responsive, LO only at 20% of CPU (i5). Speed is 2 files per second, but I have low disk write speed. Unfortunately counter tends to got stuck sometimes (you have to move the windows few times). Selecting direct printing took: - 1000 records - 4:00 and so on... All this is at constant 1000 records in 4 minutes ratio. Speed is x(x) records per second. Luckily we discovered this method before former Office users demanded to be back with Microsoft instead of LibreOffice. As they wanted to print only few files per batch, we saved the day. No complaints since then... All in all - still slow if you generate xxx(x) records/files, but definitely faster that the Wizard. Best regards. -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4115215p4115312.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - svx/source
svx/source/tbxctrls/colorwindow.hxx |2 -
svx/source/tbxctrls/tbcontrl.cxx| 50 ++--
2 files changed, 15 insertions(+), 37 deletions(-)
New commits:
commit 8056d1697e060eea0889b25e373b027d7c428c77
Author: Krisztian Pinter
Date: Fri Jul 11 19:16:13 2014 +0200
Move palette selection ComboBox to top of popup window
Change-Id: Iff958cc8d2ef301a43db406aa38dd446bb2242a5
diff --git a/svx/source/tbxctrls/colorwindow.hxx
b/svx/source/tbxctrls/colorwindow.hxx
index fd8eef7..086cdef 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -52,8 +52,6 @@ private:
const sal_uInt16 nButtonHeight;
PaletteManager& mrPaletteManager;
-void UpdateGUI();
-
DECL_LINK( SelectHdl, void * );
DECL_LINK( SelectPaletteHdl, void *);
DECL_LINK( OpenPickerClickHdl, void * );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6a307b2..cf6de14 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -100,7 +100,6 @@
// don't make more than 15 entries visible at once
#define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 )
-static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet, sal_uInt16
nVertPadding );
static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const
Size &aItemSize );
// namespaces
@@ -1134,7 +1133,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&
rCommand,
aPaletteComboBox.SetText( aPaletteList[ mrPaletteManager.GetPalette() ] );
aButtonPicker.SetText("P");
-aButtonPicker.SetSizePixel(Size(nButtonWidth, nButtonHeight));
aButtonPicker.SetClickHdl( LINK( this, SvxColorWindow_Impl,
OpenPickerClickHdl ) );
aButtonPicker.Show();
@@ -1148,26 +1146,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const
OUString&rCommand,
AddStatusListener( OUString( ".uno:ColorTableState" ));
AddStatusListener( maCommand );
-UpdateGUI();
-}
-
-
-void SvxColorWindow_Impl::UpdateGUI()
-{
mrPaletteManager.ReloadColorSet(aColorSet);
-
-const Size
aNewSize(aColorSet.layoutAllVisible(mrPaletteManager.GetColorCount()));
-aColorSet.SetOutputSizePixel(aNewSize);
-static sal_Int32 nAdd = 4;
-
-//TODO: Move left/right buttons above the colors
-SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + nAdd
+ nButtonHeight));
-
-aPaletteComboBox.SetPosPixel(Point(0, aNewSize.Height() + nAdd + 1));
-
-aButtonPicker.SetPosPixel(Point(aNewSize.Width() + nAdd - nButtonWidth,
aNewSize.Height() + nAdd + 1));
-
-aPaletteComboBox.SetSizePixel(Size(aNewSize.Width() - nButtonWidth,
nButtonHeight));
}
SvxColorWindow_Impl::~SvxColorWindow_Impl()
@@ -1226,7 +1205,8 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl)
OUString sSrchTxt = aPaletteComboBox.GetText();
sal_Int32 nPos = aPaletteComboBox.GetEntryPos( sSrchTxt );
mrPaletteManager.SetPalette( nPos );
-UpdateGUI();
+mrPaletteManager.ReloadColorSet(aColorSet);
+Resize();
return 0;
}
@@ -1238,7 +1218,16 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl)
void SvxColorWindow_Impl::Resize()
{
-lcl_ResizeValueSet( *this, aColorSet, nButtonHeight + 2);
+const Size aSize(this->GetOutputSizePixel());
+aColorSet.SetPosSizePixel( Point(2, nButtonHeight + 2), Size(aSize.Width()
- 4, aSize.Height() - 6 - nButtonHeight) );
+
+const Size
aNewSize(aColorSet.layoutAllVisible(mrPaletteManager.GetColorCount()));
+aColorSet.SetOutputSizePixel(aNewSize);
+
+SetOutputSizePixel(Size(aNewSize.Width() + 4, aNewSize.Height() + 4 +
nButtonHeight));
+
+aPaletteComboBox.SetPosSizePixel(Point(2, 0), Size(aNewSize.Width() -
nButtonWidth, nButtonHeight));
+aButtonPicker.SetPosSizePixel(Point(aNewSize.Width() + 4 - nButtonWidth,
0), Size(nButtonWidth, nButtonHeight));
}
void SvxColorWindow_Impl::StartSelection()
@@ -1257,7 +1246,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID,
SfxItemState eState, co
{
if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorListItem )))
{
-UpdateGUI();
+mrPaletteManager.ReloadColorSet(aColorSet);
}
else if ( SFX_ITEM_DEFAULT <= eState )
{
@@ -1504,7 +1493,8 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
void SvxFrameWindow_Impl::Resize()
{
-lcl_ResizeValueSet( *this, aFrameSet, 0 );
+const Size aSize(this->GetOutputSizePixel());
+aFrameSet.SetPosSizePixel(Point(2,2), Size(aSize.Width() - 4,
aSize.Height() - 4));
}
@@ -2709,16 +2699,6 @@ void SvxSimpleUndoRedoController::StateChanged(
sal_uInt16, SfxItemState eState,
-static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet, sal_uInt16
nVertPadding)
-{
-Size aSize = rWin.GetOutputSizePixel();
-aSize.Width() -= 4;
-aSize.Height() -= 4 + nVertPadding;
-
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TblStylePrHandler.cxx |9 ++---
writerfilter/source/dmapper/TblStylePrHandler.hxx |3 ++-
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit daf354fa7f2cf800a0661813ddf8d7c49c5c5f59
Author: Miklos Vajna
Date: Fri Jul 11 18:54:00 2014 +0200
Use comphelper::SequenceAsVector
Change-Id: I0d1e22344a2aa1474d022364b12cd34d7d56c2d8
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index ffd8dd6..24fee7d 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -103,7 +103,7 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
case NS_ooxml::LN_CT_TrPrBase:
case NS_ooxml::LN_CT_TcPrBase:
{
-std::vector aSavedGrabBag;
+comphelper::SequenceAsVector aSavedGrabBag;
bool bGrabBag = rSprm.getId() == NS_ooxml::LN_CT_PPrBase ||
rSprm.getId() == NS_ooxml::LN_EG_RPrBase ||
rSprm.getId() == NS_ooxml::LN_CT_TblPrBase ||
@@ -173,12 +173,7 @@ beans::PropertyValue
TblStylePrHandler::getInteropGrabBag(const OUString& aName)
beans::PropertyValue aRet;
aRet.Name = aName;
-uno::Sequence aSeq(m_aInteropGrabBag.size());
-beans::PropertyValue* pSeq = aSeq.getArray();
-for (std::vector::iterator i =
m_aInteropGrabBag.begin(); i != m_aInteropGrabBag.end(); ++i)
-*pSeq++ = *i;
-
-aRet.Value = uno::makeAny(aSeq);
+aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
return aRet;
}
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx
b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index cb13b26..3191efa 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
namespace writerfilter {
namespace dmapper {
@@ -57,7 +58,7 @@ private:
TblStyleTypem_nType;
PropertyMapPtr m_pProperties;
-std::vector m_aInteropGrabBag;
+comphelper::SequenceAsVector m_aInteropGrabBag;
// Properties
virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aoo-fillattribute' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/formulacell.hxx |2 +-
sc/source/core/data/formulacell.cxx |4 ++--
sc/source/core/data/table3.cxx |3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1
Author: Eike Rathke
Date: Fri Jul 11 18:35:39 2014 +0200
resolved fdo#79441 keep 3D references intact during sort
Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 9e55aec..e13e2bb 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -160,7 +160,7 @@ public:
virtual ~ScFormulaCell();
ScFormulaCell* Clone() const;
-ScFormulaCell* Clone( const ScAddress& rPos ) const;
+ScFormulaCell* Clone( const ScAddress& rPos, int nCloneFlags ) const;
ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos );
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index c1fbfab..44d0807 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -829,9 +829,9 @@ ScFormulaCell* ScFormulaCell::Clone() const
return new ScFormulaCell(*this, *pDocument, aPos);
}
-ScFormulaCell* ScFormulaCell::Clone( const ScAddress& rPos ) const
+ScFormulaCell* ScFormulaCell::Clone( const ScAddress& rPos, int nCloneFlags )
const
{
-return new ScFormulaCell(*this, *pDocument, rPos);
+return new ScFormulaCell(*this, *pDocument, rPos, nCloneFlags);
}
size_t ScFormulaCell::GetHash() const
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 959a919..72a066c 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -679,7 +679,8 @@ void ScTable::SortReorderByRow( ScSortInfoArray* pArray,
ScProgress* pProgress )
{
assert(rCell.mpAttr);
size_t n = rCellStore.size();
-sc::CellStoreType::iterator itBlk =
rCellStore.push_back(rCell.maCell.mpFormula->Clone(aCellPos));
+sc::CellStoreType::iterator itBlk = rCellStore.push_back(
rCell.maCell.mpFormula->Clone(
+aCellPos, SC_CLONECELL_DEFAULT |
SC_CLONECELL_ADJUST3DREL));
// Join the formula cells as we fill the container.
size_t nOffset = n - itBlk->position;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source
cui/source/options/personalization.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9f15a103b627682aeabf1e87f0b3323ed671e236
Author: Rachit Gupta
Date: Fri Jul 11 21:50:54 2014 +0530
Fixed crash when cancel is clicked without searching.
Change-Id: I67ca901270874794ec55d5b7db2cd18e6d3a997d
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index d69076e..905801d 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -159,7 +159,8 @@ IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /*
pButton */ )
IMPL_LINK( SelectPersonaDialog, ActionCancel, PushButton*, /* pButton */ )
{
-m_rSearchThread->StopExecution();
+if( m_rSearchThread.is() )
+m_rSearchThread->StopExecution();
EndDialog( RET_CANCEL );
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - embeddedobj/source include/svx offapi/com offapi/UnoApi_offapi.mk svx/source
embeddedobj/source/commonembedding/miscobj.cxx |8 -
embeddedobj/source/commonembedding/persistence.cxx | 10 ++-
embeddedobj/source/inc/commonembobj.hxx|8 -
include/svx/svdoole2.hxx |7
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/embed/XEmbedPersist2.idl | 30 +
svx/source/svdraw/svdetc.cxx |4 --
svx/source/svdraw/svdoole2.cxx | 16 ++-
8 files changed, 62 insertions(+), 22 deletions(-)
New commits:
commit abaa319d3bfe3d50c978835c92aea600fddd5241
Author: Kohei Yoshida
Date: Fri Jul 11 10:50:29 2014 -0400
bnc#883684: Better fix for this.
Instead of making all chart objects exempt from unloading, check each OLE
object on whether or not it already has its persistent storage created.
If not, don't unload it else it would have nothing to load back from once
unloaded.
(cherry picked from commit a0bd5587a5ac62974bdb10731d3fd21584521a72)
Conflicts:
svx/source/svdraw/svdetc.cxx
embeddedobj/source/commonembedding/miscobj.cxx
embeddedobj/source/commonembedding/persistence.cxx
include/svx/svdoole2.hxx
svx/source/svdraw/svdoole2.cxx
Change-Id: I2312e86c9376d3699ef4aa1e0cf2f4c04f706c1e
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx
b/embeddedobj/source/commonembedding/miscobj.cxx
index 70b8696..8ce2f84 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -363,6 +363,11 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface(
const uno::Type& rType
void * p = static_cast< embed::XEmbeddedObject * >( this );
return uno::Any( &p, rType );
}
+else if (rType == ::getCppuType( (uno::Reference
const *)0 ))
+{
+void* p = static_cast(this);
+return uno::Any(&p, rType);
+}
else
aReturn <<= ::cppu::queryInterface(
rType,
@@ -431,7 +436,8 @@ uno::Sequence< uno::Type > SAL_CALL
OCommonEmbeddedObject::getTypes()
::getCppuType( (const
uno::Reference< embed::XInplaceObject >*)NULL ),
::getCppuType( (const
uno::Reference< embed::XCommonEmbedPersist >*)NULL ),
::getCppuType( (const
uno::Reference< container::XChild >*)NULL ),
-::getCppuType( (const
uno::Reference< embed::XEmbedPersist >*)NULL ) );
+::getCppuType( (const
uno::Reference< embed::XEmbedPersist >*)NULL ),
+::getCppuType( (const
uno::Reference< embed::XEmbedPersist2 >*)NULL ) );
pTypeCollection = &aTypeCollection ;
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx
b/embeddedobj/source/commonembedding/persistence.cxx
index 4891656..44b4e30 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1799,7 +1799,15 @@ void SAL_CALL OCommonEmbeddedObject::reload(
}
}
-//--
+sal_Bool SAL_CALL OCommonEmbeddedObject::isStored() throw
(css::uno::RuntimeException, std::exception)
+{
+uno::Reference xNA(m_xObjectStorage,
uno::UNO_QUERY);
+if (!xNA.is())
+return false;
+
+return xNA->getElementNames().getLength() > 0;
+}
+
void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference<
embed::XStorage >& xStorage,
const OUString& sEntName )
throw ( lang::IllegalArgumentException,
diff --git a/embeddedobj/source/inc/commonembobj.hxx
b/embeddedobj/source/inc/commonembobj.hxx
index 83e4445..4c23325 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -27,7 +27,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -72,7 +72,7 @@ namespace comphelper {
class Interceptor;
class OCommonEmbeddedObject : public ::com::sun::star::embed::XEmbeddedObject
-, public ::com::sun::star::embed::XEmbedPersist
+, public ::com::sun::star::embed::XEmbedPersist2
, public ::com::sun::star::embed::XLinkageSupport
, public ::com::sun::star::embed::XInplaceObject
, public ::com::sun::star::container::XChild
@@ -431,6 +431,10 @@ public:
::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException );
+// XEmbedPersist2
+
+virtual sal_Bool SAL_CALL isStored()
+throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInplaceObje
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/vclxwindows.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit bce99945d8bf764bfd40183a709142e0ea6b36ac
Author: Caolán McNamara
Date: Fri Jul 11 16:15:25 2014 +0100
coverity#736076 Missing break in switch, its got to be wrong
Change-Id: I21a3b2b794a431d07df8a1bc250e8f0aacaf3059
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 00f7cc5..71d4f03 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2576,6 +2576,7 @@ throw(::com::sun::star::uno::RuntimeException,
std::exception)
// but no pages created
if ( nId && nId <= getWindows().getLength() )
activateTab( nId );
+break;
}
case BASEPROPERTY_GRAPHIC:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/bnc884615.docx |binary
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |6 ++
writerfilter/source/dmapper/DomainMapper.cxx |2 +-
writerfilter/source/dmapper/OLEHandler.cxx | 10 --
writerfilter/source/dmapper/OLEHandler.hxx |4 +++-
5 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 5360af296a67d40d9172a877a674f454eed8fa98
Author: Miklos Vajna
Date: Fri Jul 4 16:38:40 2014 +0200
bnc#884615 VML import: import OLE objects in header with background wrapping
We already do this for drawingML shapes since commit
500343105707a9905f5198a4af6ad58fe307b7c2 (DOCX drawingML shape import:
always set Opaque, 2013-12-04), make the VML / OLE case behave the same
as well.
(cherry picked from commit 15c3a08b8b1e8060f9659c7bc98480a39d1802c5)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
Change-Id: Ic22f1f3cfd325ccbbb9bd6fe9814553683e4de55
Reviewed-on: https://gerrit.libreoffice.org/10088
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/ooxmlexport/data/bnc884615.docx
b/sw/qa/extras/ooxmlexport/data/bnc884615.docx
new file mode 100755
index 000..51ee5ca
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc884615.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index f3ebd43..142d087 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1513,6 +1513,12 @@ DECLARE_OOXMLEXPORT_TEST(testPresetShape,
"preset-shape.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(21600), aSubViewSize[0].Height);
}
+DECLARE_OOXMLEXPORT_TEST(testBnc884615, "bnc884615.docx")
+{
+// The problem was that the shape in the header wasn't in the background.
+CPPUNIT_ASSERT_EQUAL(false, bool(getProperty(getShape(1),
"Opaque")));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 98286c3..b854738 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2211,7 +2211,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
writerfilter::Reference::Pointer_t pProperties =
rSprm.getProps();
if( pProperties.get( ) )
{
-OLEHandlerPtr pOLEHandler( new OLEHandler );
+OLEHandlerPtr pOLEHandler( new OLEHandler(*this) );
pProperties->resolve(*pOLEHandler);
if ( pOLEHandler->isOLEObject( ) )
{
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx
b/writerfilter/source/dmapper/OLEHandler.cxx
index 1976a13..a07b443 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include
+#include
#include
#include "GraphicHelpers.hxx"
@@ -45,11 +46,12 @@ namespace dmapper {
using namespace ::com::sun::star;
-OLEHandler::OLEHandler() :
+OLEHandler::OLEHandler(DomainMapper& rDomainMapper) :
LoggedProperties(dmapper_logger, "OLEHandler"),
m_nDxaOrig(0),
m_nDyaOrig(0),
-m_nWrapMode(1)
+m_nWrapMode(1),
+m_rDomainMapper(rDomainMapper)
{
}
@@ -104,6 +106,10 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
try
{
+// Shapes in the header or footer should be in the
background.
+if (m_rDomainMapper.IsInHeaderFooter())
+xShapeProps->setPropertyValue("Opaque",
uno::makeAny(false));
+
m_aShapeSize = xTempShape->getSize();
m_aShapePosition = xTempShape->getPosition();
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx
b/writerfilter/source/dmapper/OLEHandler.hxx
index 00b4d8a..9e22fc1 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -40,6 +40,7 @@ namespace com{ namespace sun{ namespace star{
namespace writerfilter {
namespace dmapper
{
+class DomainMapper;
/** Handler for OLE objects
*/
class OLEHandler : public LoggedProperties
@@ -63,6 +64,7 @@ class OLEHandler : public LoggedProperties
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
m_xReplacement;
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
m_xInputStream;
+DomainMapper& m_rDomainMapper;
// Properties
virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
@@ -73,7 +75,7 @@ class OLEHandler : public LoggedProperties
const OUString& sObjectName );
public:
-OLEHandler();
+OLEHandler(DomainMapper& rDomainMapper);
virtual ~OLEHandler();
inline ::com::sun::star::uno::Reference< ::com::sun::star
[Libreoffice-commits] core.git: configure.ac
configure.ac | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 9e328623c450eac763b88317bda059addbcacb48
Author: Douglas Mencken
Date: Tue Jul 8 15:41:31 2014 -0400
allow modern GCC to be automatically chosen on OS X 10.5
Don't force gcc-4.2 for OS X SDK 10.5 when $CC version is newer than 4.2
Change-Id: I7031517f8c2140a9dcb56abe6f6db5c9ed8f21f9
Reviewed-on: https://gerrit.libreoffice.org/10118
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/configure.ac b/configure.ac
index 490097a..4da4ab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2943,8 +2943,15 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what compiler to use])
case $with_macosx_sdk in
10.5)
-CC="${gccprefix}gcc-4.2 $arch
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
-CXX="${gccprefix}g++-4.2 $arch
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+_gcc_version=`gcc -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'`
+_gcc42_version=`gcc-4.2 -dumpversion | $AWK -F. '{ print
\$1*100+\$2 }'`
+if test "$_gcc_version" -gt "$_gcc42_version"; then
+CC="gcc -mmacosx-version-min=$with_macosx_version_min_required"
+CXX="g++
-mmacosx-version-min=$with_macosx_version_min_required"
+else
+CC="gcc-4.2
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+CXX="g++-4.2
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH"
+fi
INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
;;
10.6)
@@ -3474,9 +3481,12 @@ if test "$GCC" = "yes" -a -z "$COM_GCC_IS_CLANG"; then
if test "$_os" = "Darwin"; then
if test "$with_macosx_sdk" = "10.5"; then
-# use gcc 4.2 for OS X SDK 10.5
+# use gcc-4.2 for OS X SDK 10.5 when "plain" gcc is not more recent
if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.2"; then
-export CC="$GCC_HOME/bin/gcc-4.2" # make CC finally available
to config.guess
+_gcc42_version=`$GCC_HOME/bin/gcc-4.2 -dumpversion | $AWK -F.
'{ print \$1*100+\$2 }'`
+if test "$GCC_VERSION" -le "$_gcc42_version"; then
+export CC=$GCC_HOME/bin/gcc-4.2
+fi
fi
AC_MSG_RESULT([using CC=$CC])
fi
___
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-6' - sfx2/source
sfx2/source/appl/impldde.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 9d54cde32053e71177964adff87ecdc994383287
Author: Herbert Dürr
Date: Wed Jul 9 15:23:59 2014 +
Related: #i125226# don't try to access known-bad DDE servers
(cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4
(cherry picked from commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2)
Related: #i125226# some macro preferences are directly...
applicable to DDE servers
(cherry picked from commit 2c835e761e1e9ddb6794895e6f3538b918160dd1)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: Ic16b3df34ac1b003a8a5cabab15ea655d05bdd18
Related: #i125226# typo fix
(cherry picked from commit 727ea069c6342e01a50c8b068ec302574b251cbd)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I8db53b7e8529d05e660a2d69e669b44c9045712c
(cherry picked from commit 13b68e24db26374ca17572de9abb429edeac32e9)
Related: #i125226# disallow absolute and relative paths for DDE servers
(cherry picked from commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I127add375a127dbbd0eaf12a10884e2636f1a332
(cherry picked from commit d1fc47793c1efbe9ff5271656283211647dd0b33)
Reviewed-on: https://gerrit.libreoffice.org/10203
Reviewed-by: Markus Mohrhard
Reviewed-by: Eike Rathke
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index cc6431d..b0b79a21 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -25,6 +25,7 @@
#include "impldde.hxx"
+#include
#include
#include
#include
@@ -45,6 +46,8 @@
#include
#include
+#include
+
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
@@ -243,15 +246,23 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
}
#if defined(WNT)
-
-// Server not up, try once more to start it.
-if( !bInWinExec )
+// check the suitability of starting the DDE server
+const SvtSecurityOptions aSecOpts;
+bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
+bForbidden |= (comphelper::string::indexOfAny(sServer, L":./%\\") !=
-1);
+static const char* aBadServers[] = { "cmd", "rundll32" };
+for (size_t i = 0; i < sizeof(aBadServers)/sizeof(*aBadServers); ++i)
+bForbidden |= sServer.equalsAscii(aBadServers[i]);
+
+// try to start the DDE server if it is not there already
+bForbidden |= (bInWinExec != false);
+if( !bForbidden )
{
OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
aCmdLine.append(".exe ");
aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 )
+if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 ) // TODO:
use CreateProcess() instead
nError = DDELINK_ERROR_APP;
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sfx2/source
sfx2/source/appl/impldde.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 77e980c5afc845bbfa075bdf934d424655e594f6
Author: Herbert Dürr
Date: Wed Jul 9 15:23:59 2014 +
Related: #i125226# don't try to access known-bad DDE servers
(cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4
(cherry picked from commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2)
Related: #i125226# some macro preferences are directly...
applicable to DDE servers
(cherry picked from commit 2c835e761e1e9ddb6794895e6f3538b918160dd1)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: Ic16b3df34ac1b003a8a5cabab15ea655d05bdd18
Related: #i125226# typo fix
(cherry picked from commit 727ea069c6342e01a50c8b068ec302574b251cbd)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I8db53b7e8529d05e660a2d69e669b44c9045712c
(cherry picked from commit 13b68e24db26374ca17572de9abb429edeac32e9)
Related: #i125226# disallow absolute and relative paths for DDE servers
(cherry picked from commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I127add375a127dbbd0eaf12a10884e2636f1a332
(cherry picked from commit d1fc47793c1efbe9ff5271656283211647dd0b33)
Reviewed-on: https://gerrit.libreoffice.org/10201
Reviewed-by: Markus Mohrhard
Reviewed-by: Eike Rathke
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 501346a..7ec637a 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -25,6 +25,7 @@
#include "impldde.hxx"
+#include
#include
#include
#include
@@ -45,6 +46,8 @@
#include
#include
+#include
+
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
@@ -243,15 +246,23 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
}
#if defined(WNT)
-
-// Server not up, try once more to start it.
-if( !bInWinExec )
+// check the suitability of starting the DDE server
+const SvtSecurityOptions aSecOpts;
+bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
+bForbidden |= (comphelper::string::indexOfAny(sServer, L":./%\\") !=
-1);
+static const char* aBadServers[] = { "cmd", "rundll32" };
+for (size_t i = 0; i < sizeof(aBadServers)/sizeof(*aBadServers); ++i)
+bForbidden |= sServer.equalsAscii(aBadServers[i]);
+
+// try to start the DDE server if it is not there already
+bForbidden |= (bInWinExec != false);
+if( !bForbidden )
{
OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
aCmdLine.append(".exe ");
aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 )
+if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 ) // TODO:
use CreateProcess() instead
nError = DDELINK_ERROR_APP;
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source
chart2/source/controller/dialogs/DialogModel.cxx | 27 ---
1 file changed, 15 insertions(+), 12 deletions(-)
New commits:
commit da866a12fac748991a25870bf2a36076a47f90b2
Author: Markus Mohrhard
Date: Sun Jun 22 03:37:24 2014 +0200
extract common code
Change-Id: I9327f232f1edb9ef052eb7868ac60774f3b6e4cf
Reviewed-on: https://gerrit.libreoffice.org/10072
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index e3f9384..4cab7d9 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -468,6 +468,19 @@ Reference< data::XDataProvider >
DialogModel::getDataProvider() const
return aResult;
}
+namespace {
+
+void addMissingRoles(DialogModel::tRolesWithRanges& rResult, const
uno::Sequence& rRoles)
+{
+for(sal_Int32 i = 0, n = rRoles.getLength(); i < n; ++i)
+{
+if(rResult.find(rRoles[i]) == rResult.end())
+
rResult.insert(DialogModel::tRolesWithRanges::value_type(rRoles[i],
OUString()));
+}
+}
+
+}
+
DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
const Reference< XDataSeries > & xSeries,
const OUString & aRoleOfSequenceForLabel,
@@ -484,21 +497,11 @@ DialogModel::tRolesWithRanges
DialogModel::getRolesWithRanges(
{
// add missing mandatory roles
Sequence< OUString > aRoles(
xChartType->getSupportedMandatoryRoles());
-OUString aEmptyString;
-sal_Int32 nI = 0;
-for( nI=0; nI < aRoles.getLength(); ++nI )
-{
-if( aResult.find( aRoles[nI] ) == aResult.end() )
-aResult.insert( DialogModel::tRolesWithRanges::value_type(
aRoles[nI], aEmptyString ));
-}
+addMissingRoles(aResult, aRoles);
// add missing optional roles
aRoles = xChartType->getSupportedOptionalRoles();
-for( nI=0; nI < aRoles.getLength(); ++nI )
-{
-if( aResult.find( aRoles[nI] ) == aResult.end() )
-aResult.insert( DialogModel::tRolesWithRanges::value_type(
aRoles[nI], aEmptyString ));
-}
+addMissingRoles(aResult, aRoles);
}
}
catch( const uno::Exception & ex )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo80410.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 +
sw/source/filter/ww8/docxattributeoutput.cxx |7 ++-
3 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 589b256452e729e05d9610f10fb2408810e56eb6
Author: Michael Stahl
Date: Thu Jul 10 22:47:27 2014 +0200
fdo#80410: sw: DOCX export: support DOCX embedded objects
(cherry picked from commit 3ffb06e76be9be7499f12973139949ddbf6297b9)
fdo#80410: let's add a unit test too...
(cherry picked from commit 46d9724369ba4f248eab0133d396bd8f6a4453c6)
Change-Id: Ifa9e12eee4139a9c9c5d17a349ff3511c62b3ea8
Reviewed-on: https://gerrit.libreoffice.org/10234
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80410.docx
b/sw/qa/extras/ooxmlexport/data/fdo80410.docx
new file mode 100644
index 000..7660d84
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80410.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 312d9d9..2d32dc1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3064,6 +3064,19 @@ DECLARE_OOXMLEXPORT_TEST(testFileWithInvalidImageLink,
"FileWithInvalidImageLink
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/pic:pic[1]/pic:blipFill[1]/a:blip[1]",
"embed", "");
}
+DECLARE_OOXMLEXPORT_TEST(testContentTypeDOCX, "fdo80410.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc) // only test the export, not initial import
+ return;
+
+assertXPath(pXmlDoc,
+
"/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.docx']",
+"ContentType",
+
"application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+}
+
DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM, "fdo76098.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3b71536..98ed78b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4199,7 +4199,12 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
sFileExtension = "docm";
}
-//Implementation for embedded Word 97-2003 document was missing
+else if (sProgID == "Word.Document.12")
+{
+sMediaType =
"application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
+sFileExtension = "docx";
+}
else if( sProgID == "Word.Document.8" )
{
sMediaType = "application/msword";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 81148, which changed state. Bug 81148 Summary: Transparency gradients for graphics are displayed completely wrong on Linux https://bugs.freedesktop.org/show_bug.cgi?id=81148 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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: embeddedobj/source include/svx offapi/com offapi/UnoApi_offapi.mk svx/source
embeddedobj/source/commonembedding/miscobj.cxx |8 -
embeddedobj/source/commonembedding/persistence.cxx |9 ++
embeddedobj/source/inc/commonembobj.hxx|8 -
include/svx/svdoole2.hxx |7
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/embed/XEmbedPersist2.idl | 30 +
svx/source/svdraw/svdetc.cxx |4 --
svx/source/svdraw/svdoole2.cxx | 16 ++-
8 files changed, 62 insertions(+), 21 deletions(-)
New commits:
commit a0bd5587a5ac62974bdb10731d3fd21584521a72
Author: Kohei Yoshida
Date: Fri Jul 11 10:50:29 2014 -0400
bnc#883684: Better fix for this.
Instead of making all chart objects exempt from unloading, check each OLE
object on whether or not it already has its persistent storage created.
If not, don't unload it else it would have nothing to load back from once
unloaded.
Change-Id: I2312e86c9376d3699ef4aa1e0cf2f4c04f706c1e
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx
b/embeddedobj/source/commonembedding/miscobj.cxx
index e880929..de1bee7 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -360,6 +360,11 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface(
const uno::Type& rType
void * p = static_cast< embed::XEmbeddedObject * >( this );
return uno::Any( &p, rType );
}
+else if (rType == cppu::UnoType::get())
+{
+void* p = static_cast(this);
+return uno::Any(&p, rType);
+}
else
aReturn <<= ::cppu::queryInterface(
rType,
@@ -428,7 +433,8 @@ uno::Sequence< uno::Type > SAL_CALL
OCommonEmbeddedObject::getTypes()
cppu::UnoType::get(),
cppu::UnoType::get(),
cppu::UnoType::get(),
-
cppu::UnoType::get());
+
cppu::UnoType::get(),
+
cppu::UnoType::get());
pTypeCollection = &aTypeCollection ;
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx
b/embeddedobj/source/commonembedding/persistence.cxx
index 5ef9253..260cce0 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1790,6 +1790,15 @@ void SAL_CALL OCommonEmbeddedObject::reload(
}
}
+sal_Bool SAL_CALL OCommonEmbeddedObject::isStored() throw
(css::uno::RuntimeException, std::exception)
+{
+uno::Reference xNA(m_xObjectStorage,
uno::UNO_QUERY);
+if (!xNA.is())
+return false;
+
+return xNA->getElementNames().getLength() > 0;
+}
+
void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference<
embed::XStorage >& xStorage,
const OUString& sEntName )
diff --git a/embeddedobj/source/inc/commonembobj.hxx
b/embeddedobj/source/inc/commonembobj.hxx
index ceba61e..0808363 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -27,7 +27,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -72,7 +72,7 @@ namespace comphelper {
class Interceptor;
class OCommonEmbeddedObject : public ::com::sun::star::embed::XEmbeddedObject
-, public ::com::sun::star::embed::XEmbedPersist
+, public ::com::sun::star::embed::XEmbedPersist2
, public ::com::sun::star::embed::XLinkageSupport
, public ::com::sun::star::embed::XInplaceObject
, public ::com::sun::star::container::XChild
@@ -429,6 +429,10 @@ public:
::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException, std::exception )
SAL_OVERRIDE;
+// XEmbedPersist2
+
+virtual sal_Bool SAL_CALL isStored()
+throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInplaceObject
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 238756b..fe41d2f 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -155,13 +155,6 @@ public:
bool IsChart() const;
bool IsCalc() const;
-/**
- * Unloadable OLE objects are subject to automatic unloading per memory
- * setting. The "Number of objects" setting in the Memory option controls
- * how many OLE objects can be loaded at any given moment.
- */
-bool IsUnloadable() const;
-
bool UpdateLinkURL_Impl();
void BreakFileLink_Impl();
void DisconnectFileLink_Impl();
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 9c56e9f..364581d 100644
--
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source
editeng/source/outliner/outliner.cxx|3 +--
svx/source/svdraw/svdotextdecomposition.cxx | 22 ++
2 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 5625b440f15564f8e12d37119a1b7f9198815d45
Author: matteocam
Date: Fri Jul 11 16:38:46 2014 +0200
Truncation in impHandleDrawPortionInfo
Change-Id: Ief79063be0ef742148c24a3eb2d4d2cb7530987e
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 34962f4..08f0b79 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1756,8 +1756,7 @@ void Outliner::DrawingText( const Point& rStartPos, const
OUString& rText, sal_I
if(aDrawPortionHdl.IsSet())
{
-// FIXME(matteocam)
-DrawPortionInfo aInfo( rStartPos, rText, nTextStart,
std::min(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
+DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont,
nPara, nIndex, pDXArray, pWrongSpellVector,
pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft,
false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
aDrawPortionHdl.Call( &aInfo );
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 2f7c4e1..e044d39 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -510,6 +510,28 @@ namespace
void impTextBreakupHandler::impHandleDrawPortionInfo(const
DrawPortionInfo& rInfo)
{
+// FIXME(matteocam)
+
+/*
+ * We want to break the text at the 10th character if we are at
+ * the end of the paragraph.
+ * XXX: How to send it back to editengine?
+ * [AutoFit uses SetGlobalStretch... from Outliner]
+ * XXX: how to pass on to the rest of the text "This should be
+ * drawn somewhere else"?
+*/
+
+bool bTruncateText = rInfo.mbEndOfParagraph; // arbitrary property
+
+if ( bTruncateText )
+{
+// truncate it at 4
+int nTruncationPoint = 4;
+rInfo.mnTextLen = std::min( rInfo.mnTextLen, nTruncationPoint );
+}
+
+// END FIXME
+
impCreateTextPortionPrimitive(rInfo);
if(rInfo.mbEndOfLine || rInfo.mbEndOfParagraph)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4cb52136220b417f09eb2156e11436ee0a06729f
Author: Matúš Kukan
Date: Fri Jul 11 17:04:30 2014 +0200
fdo#81148: Fix transparency gradients.
regression from a5351434fbea1126961f5dbaa986e7c9e686c24e.
Revert one line from that commit without too much understanding :-/
Change-Id: I126c25e2ad945ef1ec20a5677406434931d0790d
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index a999099..a3bdbf6 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -370,7 +370,7 @@ namespace drawinglayer
OSL_ENSURE(mpContent, "impBufferDevice: No content, check isVisible()
before accessing (!)");
if(!mpAlpha)
{
-mpAlpha = getVDevBuffer().alloc(mrOutDev, maDestPixel.GetSize(),
true, 8);
+mpAlpha = getVDevBuffer().alloc(mrOutDev, maDestPixel.GetSize(),
true, 0);
mpAlpha->SetMapMode(mpContent->GetMapMode());
// copy AA flag for new target; masking needs to be smooth
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - avmedia/source
avmedia/source/opengl/oglplayer.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 32ef78f1f3e1fd8c714ec7228be660f1edb97500 Author: Zolnai Tamás Date: Fri Jul 11 07:53:19 2014 +0200 glTF: crash after starting a model without an OpenGL window Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e (cherry picked from commit 6174152cfffd8e31b9eda238990a161c8c2b9a71) Reviewed-on: https://gerrit.libreoffice.org/10218 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 85daa8d..f39f847 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -144,6 +144,9 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception ) osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); +if(!m_pOGLWindow) +return; + // gltf_animation_start play animation from the time 0.0, // but OGLPlayer::start used as play from that time where it was stopped before double fTime = gltf_animation_get_time(m_pHandle); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - avmedia/source
avmedia/source/opengl/oglplayer.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit cb0cdfe344354b32a526780d78e50a9e8e1f8ab8 Author: Zolnai Tamás Date: Fri Jul 11 11:23:29 2014 +0200 glTF: Removing one model breaks an other model Reproduce: - Insert two models - Play first model - Delete second model Result: crash (windows) or first model disappear from the opengl window (linux). Change-Id: I940960754f42a2e4faf5b9f37c0d4a3c155e4650 (cherry picked from commit 30fcee6ce56ec4e50ee86c308ca5621746d817d5) Reviewed-on: https://gerrit.libreoffice.org/10217 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index b481943..85daa8d 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -44,6 +44,7 @@ OGLPlayer::~OGLPlayer() delete [] m_pHandle->files[i].buffer; } } +m_aContext.makeCurrent(); gltf_renderer_release(m_pHandle); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source include/sfx2 sfx2/AllLangResTarget_sfx2.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk svtools/source
extras/source/glade/libreoffice-catalog.xml.in |3
include/sfx2/templateinfodlg.hxx |4 -
sfx2/AllLangResTarget_sfx2.mk |1
sfx2/UIConfig_sfx.mk |3
sfx2/source/dialog/templateinfodlg.cxx | 28 ++--
sfx2/source/dialog/templateinfodlg.hrc | 14
sfx2/source/dialog/templateinfodlg.src | 28
sfx2/uiconfig/ui/templateinfodialog.ui | 79 +
svtools/source/contnr/DocumentInfoPreview.cxx |5 +
9 files changed, 101 insertions(+), 64 deletions(-)
New commits:
commit bfdacadec9a6472826a23ef86d5ebe21794e1bf9
Author: Palenik Mihály
Date: Fri Jul 11 09:05:53 2014 +0200
Convert DLG_TEMPLATE_INFORMATION to .ui
Change-Id: I66469c17a46c1157b8e3801c0dc2b252c569a4bd
Reviewed-on: https://gerrit.libreoffice.org/10213
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index f8b74a7..5250a82 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -355,6 +355,9 @@
+
diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx
index dd32e49..a38f981 100644
--- a/include/sfx2/templateinfodlg.hxx
+++ b/include/sfx2/templateinfodlg.hxx
@@ -12,6 +12,7 @@
#include
#include
+#include
namespace svtools {
class ODocumentInfoPreview;
@@ -36,7 +37,8 @@ protected:
private:
-PushButton maBtnClose;
+PushButton* mpBtnClose;
+VclBox* mpBox;
Window *mpPreviewView; // gets released when xWindows get destroyed (dont
delete in constructor)
svtools::ODocumentInfoPreview *mpInfoView;
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 9d7b685..6513e1cb 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/dialog/newstyle.src \
sfx2/source/dialog/recfloat.src \
sfx2/source/dialog/taskpane.src \
-sfx2/source/dialog/templateinfodlg.src \
sfx2/source/dialog/templdlg.src \
sfx2/source/dialog/versdlg.src \
sfx2/source/doc/doc.src \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 310d6e43..0713047 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -40,10 +40,11 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/securityinfopage \
sfx2/uiconfig/ui/singletabdialog \
sfx2/uiconfig/ui/startcenter \
+ sfx2/uiconfig/ui/templatedlg \
+ sfx2/uiconfig/ui/templateinfodialog \
sfx2/uiconfig/ui/versionsofdialog \
sfx2/uiconfig/ui/versioncommentdialog \
sfx2/uiconfig/ui/versionscmis \
- sfx2/uiconfig/ui/templatedlg \
))
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/source/dialog/templateinfodlg.cxx
b/sfx2/source/dialog/templateinfodlg.cxx
index 9437f33..45dcd78 100644
--- a/sfx2/source/dialog/templateinfodlg.cxx
+++ b/sfx2/source/dialog/templateinfodlg.cxx
@@ -24,10 +24,6 @@
#include
#include
-#include "templateinfodlg.hrc"
-
-#define DLG_BORDER_SIZE 12
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::document;
@@ -37,34 +33,28 @@ using namespace ::com::sun::star::task;
using namespace ::com::sun::star::util;
SfxTemplateInfoDlg::SfxTemplateInfoDlg (Window *pParent)
-: ModalDialog(pParent,SfxResId(DLG_TEMPLATE_INFORMATION)),
- maBtnClose(this,SfxResId(BTN_TEMPLATE_INFO_CLOSE)),
- mpPreviewView(new Window(this)),
- mpInfoView(new svtools::ODocumentInfoPreview(this,WB_LEFT | WB_VSCROLL |
WB_READONLY | WB_BORDER | WB_3DLOOK))
+: ModalDialog(pParent, "TemplateInfo", "sfx/ui/templateinfodialog.ui")
{
-maBtnClose.SetClickHdl(LINK(this,SfxTemplateInfoDlg,CloseHdl));
+get(mpBtnClose, "close");
+get(mpBox, "box");
+get(mpInfoView, "infoDrawingArea");
+mpPreviewView = new Window(mpBox);
-Size aWinSize = GetOutputSizePixel();
-aWinSize.setHeight( aWinSize.getHeight() - 3*DLG_BORDER_SIZE -
maBtnClose.GetOutputHeightPixel() );
-aWinSize.setWidth( (aWinSize.getWidth() - 3*DLG_BORDER_SIZE)/2 );
-
mpInfoView->SetPosSizePixel(Point(DLG_BORDER_SIZE,DLG_BORDER_SIZE),aWinSize);
+Size aSize(LogicToPixel(Size(250, 160), MAP_APPFONT));
+mpBox->set_width_request(aSize.Width());
+mpBox->set_height_request(aSize.Height());
-
mpPreviewView->SetPosSizePixel(Point(aWinSize.getWidth()+2*DLG_BORDER_SIZE,DLG_BORDER_SIZE),aWinSize);
+mpBtnClose->SetClickHdl(LINK(this,SfxTemplateInfoDlg,CloseHdl));
xWindow = VCLUnoHelper::GetInterface(mpPreviewView);
m_xFrame = Frame::create( comphelper::getProcessComponentContext() );
m_xFrame->initialize( xWindow );
-
-mpPreviewView->Show();
-mpInfoView->Show();
[Libreoffice-commits] core.git: external/nss external/openssl external/python3
external/nss/ExternalProject_nss.mk |5 +-
external/nss/nss_macosx.patch| 47 ++-
external/openssl/UnpackedTarball_openssl.mk |1
external/openssl/opensslosxppc.patch | 15
external/python3/ExternalProject_python3.mk |3 +
external/python3/python-3.3.0-darwin.patch.1 |2 -
6 files changed, 55 insertions(+), 18 deletions(-)
New commits:
commit f4beadc6e28b812237e01e6f8f2c4afcf57bb4d5
Author: Douglas Mencken
Date: Mon Jul 7 14:18:12 2014 -0400
avoid -arch for bundled OpenSSL, Python3, and nss/nspr on OSX@PowerPC
this fixes gcc: error: unrecognized command line option '-arch'
The '-arch' option is part of Apple's extensions to GCC, and it is
uncompatible
with "vanilla" GCC from FSF. Also, we're not building "universal binaries".
Change-Id: I44e7c72bbb1dd4be5ac9cdbc4f210aaccea513b4
Reviewed-on: https://gerrit.libreoffice.org/10117
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index b7e07f7..cfda1ac 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -59,8 +59,9 @@ else # OS!=WNT
$(call gb_ExternalProject_get_state_target,nss,build): $(call
gb_ExternalProject_get_state_target,nss,configure) $(call
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter
X86_64,$(CPUNAME)),USE_64=1)) \
- $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
- $(if $(filter
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,NSS_USE_SYSTEM_SQLITE=1)) \
+ $(if $(filter MACOSX,$(OS)),\
+ $(if $(filter-out
POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
+ $(if $(filter-out
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 853cd34..348d42b 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,6 +1,6 @@
a/a/nss/Makefile 2008-12-03 00:24:39.0 +0100
-+++ b/b/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
-@@ -104,6 +104,9 @@
+--- a/a/nss/Makefile
b/b/nss/Makefile
+@@ -69,6 +69,9 @@
ifeq ($(OS_TARGET),WIN95)
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
endif
@@ -10,9 +10,33 @@
ifdef USE_DEBUG_RTL
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
+--- a/a/nspr/configure.in
b/b/nspr/configure.in
+@@ -1374,7 +1374,9 @@
+ ;;
+ esac
+ if test "`echo $CC | grep -c '\-arch '`" = "0"; then
+-CC="$CC -arch $CPU_ARCH"
++if test "$CPU_ARCH" != "ppc"; then
++CC="$CC -arch $CPU_ARCH"
++fi
+ fi
+ AC_CHECK_HEADER(crt_externs.h)
+ DSO_CFLAGS=-fPIC
--- a/a/nspr/configure
+++ b/b/nspr/configure
-@@ -3888,7 +3889,7 @@
+@@ -3864,7 +3864,9 @@
+ ;;
+ esac
+ if test "`echo $CC | grep -c '\-arch '`" = "0"; then
+-CC="$CC -arch $CPU_ARCH"
++if test "$CPU_ARCH" != "ppc"; then
++CC="$CC -arch $CPU_ARCH"
++fi
+ fi
+ ac_safe=`echo "crt_externs.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for crt_externs.h""... $ac_c" 1>&6
+@@ -3900,7 +3902,7 @@
fi
DSO_CFLAGS=-fPIC
@@ -23,7 +47,7 @@
STRIP="$STRIP -x -S"
--- a/a/nss/coreconf/Darwin.mk
+++ b/b/nss/coreconf/Darwin.mk
-@@ -39,8 +39,12 @@
+@@ -7,8 +7,12 @@
DEFAULT_COMPILER = gcc
@@ -38,7 +62,7 @@
RANLIB= ranlib
ifndef CPU_ARCH
-@@ -57,19 +57,25 @@
+@@ -19,11 +23,15 @@
ifeq (,$(filter-out i%86,$(CPU_ARCH)))
ifdef USE_64
@@ -54,19 +78,14 @@
override CPU_ARCH = x86
endif
else
- ifeq (arm,$(CPU_ARCH))
+@@ -31,17 +39,20 @@
# Nothing set for arm currently.
else
OS_REL_CFLAGS = -Dppc
-+ifeq (,$(findstring -arch ,$(CC)))
- CC += -arch ppc
-+endif
+-CC += -arch ppc
endif
endif
-@@ -64,12 +64,16 @@
- endif
-
ifneq (,$(MACOS_SDK_DIR))
+CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed
-e "s/^.*clang version[ ]*//" | awk '{ print $$1 }')
GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
@@ -82,7 +101,7 @@
# GCC <= 3
DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
-@@ -150,7 +150,7 @@
+@@ -104,7 +115,7 @@
# May override this with different compatibility and current version numbers.
DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
# May override this with -bundle to create a lo
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/colorpickerdialog.ui | 25 + 1 file changed, 25 insertions(+) New commits: commit 96e3a8821d7738ee29dedf9c0c5b0b6f96fae6c7 Author: Caolán McNamara Date: Fri Jul 11 15:37:20 2014 +0100 add adjustments for spinbuttons Change-Id: I11e8ce8fcbf468797b08a1a3101030fd07397c98 diff --git a/cui/uiconfig/ui/colorpickerdialog.ui b/cui/uiconfig/ui/colorpickerdialog.ui index 979c163..2567d53 100644 --- a/cui/uiconfig/ui/colorpickerdialog.ui +++ b/cui/uiconfig/ui/colorpickerdialog.ui @@ -3,6 +3,21 @@ + +255 +1 +10 + + +360 +1 +10 + + +100 +1 +10 + False True @@ -294,6 +309,7 @@ True True True +adjustment1 1 @@ -307,6 +323,7 @@ True True True +adjustment1 1 @@ -320,6 +337,7 @@ True True True +adjustment1 1 @@ -465,6 +483,7 @@ True True True +adjustment2 1 @@ -478,6 +497,7 @@ True True True +adjustment3 1 @@ -491,6 +511,7 @@ True True True +adjustment3 1 @@ -615,6 +636,7 @@ True True True +adjustment3 1 @@ -628,6 +650,7 @@ True True True +adjustment3 1 @@ -641,6 +664,7 @@ True True True +adjustment3 1 @@ -654,6 +678,7 @@ True True True +adjustment3 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/calctiledrendering4'
New branch 'feature/calctiledrendering4' available with the following commits: commit 54070217e629719a3fd94a7f071051056c135873 Author: Andrzej Hunt Date: Fri Jul 11 16:35:58 2014 +0200 More pixel->document coordinate scaling. Change-Id: Iea3877c024d66fa6b80d447c749246148f2dc11d commit 8772ef136318bb589a0484cc37ec171fe3829b2d Author: Andrzej Hunt Date: Fri Jul 11 10:23:15 2014 +0200 Add png dumping to LOK tiled rendering test. This allows for easier visual comparisons (i.e. currently the test would be failing for some tiles). Change-Id: I5b174375b57ffe0edd2700fdec411a83669e4a34 commit 293e9332629a5afbb2b08b870af80399b7b98d3a Author: Andrzej Hunt Date: Fri Jul 11 09:07:06 2014 +0200 DON'T MERGE: the viewport doesn't get set otherwise? When writing the tiled rendering test, asserts were firing because the redraw area wasn't set on the page -- however I don't understand things well enought yet to know whether or not this is the correct solution.. (Especially as this happened only for certain tile configurations.) Change-Id: I187d639b00d0748e7cc9fd6cc33d555f02f9a081 commit 5087e21970a3f62f4f62348d79ce3b9df85eec1c Author: Andrzej Hunt Date: Thu Jul 3 14:47:15 2014 +0200 Iterate from origin to tile area to ensure correct positioning. Change-Id: I29e881f9e67b84e208a198d2aad06db382d14698 commit 8265a55aa036d2453521723ca57e9ef27228639b Author: Andrzej Hunt Date: Thu Jul 3 14:46:32 2014 +0200 Use logic units for visible-cells determination. This eliminates a bunch of LogicToPixel conversions, and also means that tiles starting other than the origin are correctly processed (as LogicToPixel run on a rectangle will also move that rectangle depending on the origin set in the output device). Change-Id: I42903fe23ad5f6baa1d5276d5dcc7ee038bd27cf commit b539322e04f1a9ea797725309c0797952935c72c Author: Andrzej Hunt Date: Thu Jul 3 14:43:28 2014 +0200 Scale the origin for the Draw Layer (Calc Tiled Rendering). Since we're changing units, we also need to scale the origin by the correct amount. Change-Id: Ie0563376e8fa56f20c30da4fe3cc50546f18e84f commit 2475c5436771b496a37735bac6cb015a90c75fbd Author: Andrzej Hunt Date: Wed Jun 25 22:37:54 2014 +0100 Use OutputDevice scaling for column-/rowbars too. This means we now match the new gridwindow dimensions. There are however some issues around selection/painting now, which are presumably related to some parts of the code still assuming pixel rather than logical dimensions. Change-Id: I15c2bc7210f26cededd63bc89dbd782e6e4c03b8 commit fe0373c9b706ce524bf4e53c347ee14f256638b5 Author: Andrzej Hunt Date: Thu Jun 26 17:06:58 2014 +0100 Ensure we actually render all cells in the selected area. Only cells within maVisibleRange are rendered, even if we request a larger area (and maVisibleRange is otherwise not updated for tiled rendering). Hence we should explicitly set it here. Change-Id: I399be9df1f266a2b3d32a95483960b21f561c6b3 commit 44d0332017e786413a5eb77d1e101068f66f0623 Author: Andrzej Hunt Date: Thu Jun 26 14:30:08 2014 +0100 Take into account drawing layer for data area size. The drawing layer could potentially have items that are outwith the data area, but we probably want to have them included for tiled rendering. Change-Id: I958c4fa29491cdb0fd80392dfcfa033306f2b76c commit cd065ed0888db078bf8ff5fddb5ba5334e6f596c Author: Andrzej Hunt Date: Tue Jun 24 22:06:59 2014 +0100 Use output device mapping for draw layer too. Otherwise draw layer items don't get scaled at all for tiled rendering. Change-Id: If65d460a83fb29b8eda692cb7c1f2bd9f7283e62 commit cac4196fdaf200dd08290d65d6e7fb39fd7cbefb Author: Andrzej Hunt Date: Fri Jun 20 11:07:33 2014 +0100 Set correct scaling for normal painting. As we no longer read the scaling from the viewdata, we should instead set it on the output device when doing normal rendering. However the grid still doesn't exactly match the external axes yet, there are probably more rounding errors wherever they are painted. Change-Id: I25b1bd9b344115578fe892aa94fbf753a3c10c81 commit da64c58871fe3378eb2cee8619f3d96ded4f2d93 Author: Andrzej Hunt Date: Fri Jun 20 10:35:45 2014 +0100 Use output device scaling to determine cells in draw-area. Change-Id: Idf4e6ccb72090a55b6a9234cafae21821e3df0b0 commit f77ef66c9c295a2cf2c50e4f180bfe69ec1d5759 Author: Andrzej Hunt Date: Fri Jun 20 09:38:50 2014 +0100 Don't scale grid and cell dimensions multiple times. Previously we had multiple layers of scaling, with rounding errors propagating, leading to up to 5% differences in expected and rendered sheet widths -- for tiled rendering dimensions have to scale accurately as we may paint
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/colorpicker.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 33be4c0f6949a57ff0cd3ef1c5ce9e32ffc91910
Author: Caolán McNamara
Date: Fri Jul 11 14:10:51 2014 +0100
return early for empty bitmap
Change-Id: I768ffe9dc1226bbcca706e0c56c6103e043b2401
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index ab32c51..cfe668b 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -358,6 +358,9 @@ void ColorFieldControl::UpdateBitmap()
const sal_Int32 nWidth = aSize.Width();
const sal_Int32 nHeight = aSize.Height();
+if (nWidth == 0 || nHeight == 0)
+return;
+
if( !mpBitmap )
{
mpBitmap = new Bitmap( aSize, 24 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/fdo80410.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 13 +
2 files changed, 13 insertions(+)
New commits:
commit 46d9724369ba4f248eab0133d396bd8f6a4453c6
Author: Michael Stahl
Date: Fri Jul 11 15:07:58 2014 +0200
fdo#80410: let's add a unit test too...
Change-Id: I2b9853dc5b85c034d767825ca2842738b61b54f5
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80410.docx
b/sw/qa/extras/ooxmlexport/data/fdo80410.docx
new file mode 100644
index 000..7660d84
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80410.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 76c3fb9..3ad8b6d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3027,6 +3027,19 @@ DECLARE_OOXMLEXPORT_TEST(testFileWithInvalidImageLink,
"FileWithInvalidImageLink
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/pic:pic[1]/pic:blipFill[1]/a:blip[1]",
"embed", "");
}
+DECLARE_OOXMLEXPORT_TEST(testContentTypeDOCX, "fdo80410.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc) // only test the export, not initial import
+ return;
+
+assertXPath(pXmlDoc,
+
"/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.docx']",
+"ContentType",
+
"application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+}
+
DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM, "fdo76098.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/impresstiledrendering'
New branch 'feature/impresstiledrendering' available with the following commits: commit 59a84a144e84f3e73735bacd08187c049cc3c311 Author: Andrzej Hunt Date: Fri Jul 11 16:21:15 2014 +0200 Impress: implement tiled rendering. However we cannot as of yet select between rendering just the slide, just the notes, or both combined -- this simply defaults to whatever mode the document was last opened in for now. Change-Id: Ia8ec0280aab75a36e430aa04c47cee4fea2db974 commit 5f30fe91a14520799062ecd6ff7fc89fda6128da Author: Andrzej Hunt Date: Fri Jul 11 16:09:30 2014 +0200 LOK: use solar mutex for setPart. Needed e.g. for changing slides in impress. Change-Id: I2f5de40d4efbacde910e27225768979a98ff1c0a commit d02988c4b93abef6f39232c64e4818bb3379f8aa Author: Andrzej Hunt Date: Fri Jul 11 09:13:21 2014 +0200 LOK: some logging for tiled rendering. Change-Id: I5779eec97507b1996cda89174a6e6c55cdd57baf commit dcbd9f8abc75792134a0477d8668f065f542ab2b Author: Andrzej Hunt Date: Fri Jul 11 09:12:58 2014 +0200 Add LOK and tiledrendering log areas. Change-Id: I885acc9b4a52835fa256c2ecd1b8da917b4f7ba7 commit 75837dfefaef467dbf8813fbf12d8f4348a9b333 Author: Andrzej Hunt Date: Fri Jul 11 09:12:27 2014 +0200 Add LOK tiled rendering divided-tile unit test. I.e. we render the same area as one larger tile, and then as 4 sub-tiles (which, when put together, should be identical to the larger tile). However currently only the top-left sub-tile actually matches the larger tile, so we have to disable the test for the remaining sub-tiles. Change-Id: If1130022b43898e20fefff3e9f592102da3e413a commit 1a163ed10084c696601bfaad33c8fc0668294e26 Author: Andrzej Hunt Date: Tue Jul 8 16:41:56 2014 +0200 Add Tiled Rendering outline to sd. Change-Id: I810d827f330690f8071b662b9ddd05cc41655a71 commit 516e1d98d2919590ab30faa98c9f8eafd2d16126 Author: Andrzej Hunt Date: Tue Jul 8 15:32:46 2014 +0200 Add part selector to gtktiledviewer. Change-Id: I569c8f0ebf4476c0a247cde15a263d1db956a14b commit bde5f1c8c38c2eebf34b5d9f65dc758ff677bf65 Author: Andrzej Hunt Date: Tue Jul 8 15:32:20 2014 +0200 LOK DocView: implement part selection. Change-Id: I2e16ca9d2d5fcd25b0435f1b9b0fbcb52b92e012 commit 96240e03a0775b0d38399ba8495be8a0f47b96eb Author: Andrzej Hunt Date: Tue Jul 8 15:23:06 2014 +0200 Add get/setPart to ITiledRenderable, and implement for sw/sc. Change-Id: Iec3d6374f029149cadf8fb9c9b16fec90146c31e commit 9eafbcd411c8fc300f7860aa6c047d5712ad8520 Author: Andrzej Hunt Date: Tue Jul 8 09:53:42 2014 +0200 gtktiledviewer: allow selecting between normal and quad-tile view. Change-Id: I85b22b93fe4ce2ffb62df8766ceea7a1bd8961ee commit 488f154c51ad51034b045275a14d04f69cf8417f Author: Andrzej Hunt Date: Tue Jul 8 09:44:40 2014 +0200 Quad Docview: only rerender on zoom if we have a document open. Same as "LOK DocView: only rerender on zoom if we have a document open." but for our quad-tiled test widget. Change-Id: I6c1b946cc9d576d1dcc4687048339d9f0b3e6eff commit c81b8298f70a3a147b19a266b343df70a0e4d43d Author: Andrzej Hunt Date: Tue Jul 8 09:43:09 2014 +0200 LOK DocView: only rerender on zoom if we have a document open. Otherwise we would segfault, and it's perfectly valid to set a zoom level _before_ opening a document (as that would e.g. save the document first being rendered on opening if the client wants to immediately render at a non-standard zoom level). Change-Id: Ide261b09f4aab8dc3b552f6c3bf55f78ffd7870c commit 4fab96631c6a27e7ab638ed7be58bd2a70ecde8a Author: Andrzej Hunt Date: Tue Jul 8 08:54:13 2014 +0200 Implement a (qa-only) quad-tiled viewer. I.e. we subdivide the document into 4 tiles: one at 100% scaling, one at 200%, one at 50%, one at 25% -- these are then post-scaled in gdk) and assembled to show as one document again. This is specifically a test only widget, primarily to be able to quickly spot any tile positioning/border-transition issues. We could theoretically make this widget inherit from the original widget, however that would mean having to introduce virtual methods etc., which is not something that we'd want in production -- in the longer run that widget will hopefully be extended to have proper tile composition etc., which would then break this widget too if it were inheriting from there. Change-Id: Ib880a1614f89724135e753013cf91aec25973e39 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering3' - sd/source
Rebased ref, commits from common ancestor:
commit 9d749da778b98fe76d49300c2c001cbd9fa29941
Author: Andrzej Hunt
Date: Fri Jul 11 16:21:15 2014 +0200
Impress: implement tiled rendering.
However we cannot as of yet select between rendering just the slide,
just the notes, or both combined -- this simply defaults to whatever
mode the document was last opened in for now.
Change-Id: Ia8ec0280aab75a36e430aa04c47cee4fea2db974
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 74133b8..f86e9cb 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -87,6 +87,7 @@
#include
#include "FrameView.hxx"
#include "ClientView.hxx"
+#include "DrawViewShell.hxx"
#include "ViewShell.hxx"
#include "app.hrc"
#include
@@ -108,6 +109,7 @@
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
+using namespace ::sd;
class SdUnoForbiddenCharsTable : public SvxUnoForbiddenCharsTable,
public SfxListener
@@ -2190,33 +2192,77 @@ void SdXImpressDocument::paintTile( VirtualDevice&
rDevice,
int nTilePosX, int nTilePosY,
long nTileWidth, long nTileHeight )
{
-(void) rDevice;
-(void) nOutputWidth;
-(void) nOutputHeight;
-(void) nTilePosX;
-(void) nTilePosY;
-(void) nTileWidth;
-(void) nTileHeight;
+// Scaling. Must convert from pixels to twips. We know
+// that VirtualDevices use a DPI of 96.
+// We specifically calculate these scales first as we're still
+// in TWIPs, and might as well minimise the number of conversions.
+Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440L) /
+Fraction( nTileWidth);
+Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440L) /
+Fraction( nTileHeight);
+
+// svx seems to be the only component that works natively in
+// 100th mm rather than TWIP. It makes most sense just to
+// convert here and in getDocumentSize, and leave the tiled
+// rendering API working in TWIPs.
+nTileWidth = convertTwipToMm100( nTileWidth );
+nTileHeight = convertTwipToMm100( nTileHeight );
+nTilePosX = convertTwipToMm100( nTilePosX );
+nTilePosY = convertTwipToMm100( nTilePosY );
+
+MapMode aMapMode = rDevice.GetMapMode();
+aMapMode.SetMapUnit( MAP_100TH_MM );
+aMapMode.SetOrigin( Point( -nTilePosX,
+ -nTilePosY) );
+aMapMode.SetScaleX( scaleX );
+aMapMode.SetScaleY( scaleY );
+
+rDevice.SetMapMode( aMapMode );
+
+rDevice.SetOutputSizePixel( Size(nOutputWidth, nOutputHeight) );
+mpDoc->GetDocSh()->GetViewShell()->GetView()->CompleteRedraw(
+&rDevice,
+Region(
+Rectangle( Point( nTilePosX, nTilePosY ),
+ Size( nTileWidth, nTileHeight ) ) ) );
+
+// TODO: Set page kind in frameview?
}
void SdXImpressDocument::setPart( int nPart )
{
-(void) nPart;
+DrawViewShell* pViewSh = dynamic_cast< DrawViewShell* >(
mpDoc->GetDocSh()->GetViewShell() );
+if (pViewSh)
+{
+pViewSh->SwitchPage( nPart );
+}
}
int SdXImpressDocument::getParts()
{
-return mpDoc->GetPageCount();
+// TODO: master pages?
+// Read: drviews1.cxx
+return mpDoc->GetSdPageCount(PK_STANDARD);
}
int SdXImpressDocument::getPart()
{
+DrawViewShell* pViewSh = dynamic_cast< DrawViewShell* >(
mpDoc->GetDocSh()->GetViewShell() );
+if (pViewSh)
+{
+return pViewSh->GetCurPageId();
+}
return 0;
}
Size SdXImpressDocument::getDocumentSize()
{
-return Size( 100, 100 );
+SdrPageView* pCurPageView =
mpDoc->GetDocSh()->GetViewShell()->GetView()->GetSdrPageView();
+Size aSize = pCurPageView->GetPageRect().GetSize();
+// Convert the size in 100th mm to TWIP
+// See paintTile above for further info.
+return Size( convertMm100ToTwip( aSize.getWidth() ),
+ convertMm100ToTwip( aSize.getHeight() ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] Text Background Color in Draw - Report 22/06/2014
This patch is for fixing the crash and generate an "inadmissible data type"
dialog.
Thorsten, I checked again and it seems to me that the code now "follows"
CharUnderlineColor everywhere.
But I have no idea about the other name CharUnderlineColor is mapped to.
On Thu, Jul 10, 2014 at 2:20 PM, Miklos Vajna
wrote:
> Hi Matteo,
>
> I noticed a crash that's probably related to your (otherwise great :-)
> ), text background editeng work -- care to take a look?
>
> 1) Start Writer, enable form controls toolbar (View -> Toolbars -> Form
> controls)
> 2) Click the more controls button, pick the Date Field
> 3) Draw a rectangle in the body text area to create an instance
> 4) Try to query its background color via UNO: Tools -> Macros ->
> Organize macros -> Basic -> Edit, then type:
>
> print ThisComponent.DrawPage(0).CharBackColor
>
> and Press F5 to run, it crashes with:
>
> Program received signal SIGSEGV, Segmentation fault.
> 0x73b4d9fc in SfxItemSet::Get (this=0x1dfaa00, nWhich=0,
> bSrchInParent=true) at
> /home/vmiklos/git/libreoffice/master/svl/source/items/itemset.cxx:1002
> 1002DBG_ASSERT( !pItem->ISA(SfxSetItem) ||
> (gdb) bt 10
> #0 0x73b4d9fc in SfxItemSet::Get (this=0x1dfaa00, nWhich=0,
> bSrchInParent=true) at
> /home/vmiklos/git/libreoffice/master/svl/source/items/itemset.cxx:1002
> #1 0x7fffd2cc9de6 in SdrObject::GetMergedItem (this=0x226b140,
> nWhich=0) at
> /home/vmiklos/git/libreoffice/master/svx/source/svdraw/svdobj.cxx:2113
> #2 0x7fffd2ea856e in SvxShape::_getPropertyValue (this=0x21c1f38,
> PropertyName="CharBackColor") at
> /home/vmiklos/git/libreoffice/master/svx/source/unodraw/unoshape.cxx:1797
>
> nWhich = 0 sounds buggy, maybe you advertise your new UNO property in a
> generic property map, but in case of form controls, the underlying
> implementation doesn't handle that?
>
> Thanks,
>
> Miklos
>
From 92ff792570b1b56c5fa135d3635f169f084cd887 Mon Sep 17 00:00:00 2001
From: matteocam
Date: Fri, 11 Jul 2014 14:58:55 +0200
Subject: [PATCH] CharBackColor advertised in unoshap2.cxx
To: libreoffice@lists.freedesktop.org
Change-Id: I0111ab571e23e37f5986301366836623476ed214
---
svx/source/unodraw/unoshap2.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index b732526..1f45dbe 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -680,7 +680,7 @@ SvxShapeControlPropertyMapping[] =
{ RTL_CONSTASCII_STRINGPARAM("CharKerning"), RTL_CONSTASCII_STRINGPARAM("FontKerning") },
{ RTL_CONSTASCII_STRINGPARAM("CharWordMode"), RTL_CONSTASCII_STRINGPARAM("FontWordLineMode" ) },
{ RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_COLOR), RTL_CONSTASCII_STRINGPARAM("TextColor") },
- // { RTL_CONSTASCII_STRINGPARAM("CharBackColor") }, // FIXME(matteocam)
+{ RTL_CONSTASCII_STRINGPARAM("CharBackColor"), RTL_CONSTASCII_STRINGPARAM("CharBackColor") },
{ RTL_CONSTASCII_STRINGPARAM("CharRelief"), RTL_CONSTASCII_STRINGPARAM("FontRelief") },
{ RTL_CONSTASCII_STRINGPARAM("CharUnderlineColor"), RTL_CONSTASCII_STRINGPARAM("TextLineColor") },
{ RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_PARA_ADJUST), RTL_CONSTASCII_STRINGPARAM("Align") },
--
1.8.3.2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 81058, which changed state. Bug 81058 Summary: formula bar not rendering contents https://bugs.freedesktop.org/show_bug.cgi?id=81058 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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: Branch 'feature/calctiledrendering3' - 3 commits - desktop/source libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/qa sd/source
desktop/source/lib/init.cxx |6 -
libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |3
libreofficekit/qa/unit/tiledrendering.cxx | 25
sd/source/ui/unoidl/unomodel.cxx| 65 ++--
4 files changed, 87 insertions(+), 12 deletions(-)
New commits:
commit b33469fc41b798cf151d26f27ced85d73663c459
Author: Andrzej Hunt
Date: Fri Jul 11 16:10:58 2014 +0200
Impress: implement tiled rendering.
However we cannot as of yet select between rendering just the slide,
just the notes, or both combined -- this simply defaults to whatever
mode the document was last opened in for now.
Change-Id: Ia8ec0280aab75a36e430aa04c47cee4fea2db974
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 74133b8..ec22916 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -87,6 +87,7 @@
#include
#include "FrameView.hxx"
#include "ClientView.hxx"
+#include "DrawViewShell.hxx"
#include "ViewShell.hxx"
#include "app.hrc"
#include
@@ -108,6 +109,7 @@
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
+using namespace ::sd;
class SdUnoForbiddenCharsTable : public SvxUnoForbiddenCharsTable,
public SfxListener
@@ -2190,33 +2192,76 @@ void SdXImpressDocument::paintTile( VirtualDevice&
rDevice,
int nTilePosX, int nTilePosY,
long nTileWidth, long nTileHeight )
{
-(void) rDevice;
-(void) nOutputWidth;
-(void) nOutputHeight;
-(void) nTilePosX;
-(void) nTilePosY;
-(void) nTileWidth;
-(void) nTileHeight;
+// Scaling. Must convert from pixels to twips. We know
+// that VirtualDevices use a DPI of 96.
+// We specifically calculate these scales first as we're still
+// in TWIPs, and might as well minimise the number of conversions.
+Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440L) /
+Fraction( nTileWidth);
+Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440L) /
+Fraction( nTileHeight);
+
+// svx seems to be the only component that works natively in
+// 100th mm rather than TWIP. It makes most sense just to
+// convert here and in getDocumentSize, and leave the tiled
+// rendering API working in TWIPs.
+nTileWidth = nTileWidth * 2540l / 1440l;
+nTileHeight = nTileHeight * 2540l / 1440l;
+nTilePosX = nTilePosX * 2540l / 1440l;
+nTilePosY = nTilePosY * 2540l / 1440l;
+
+MapMode aMapMode = rDevice.GetMapMode();
+aMapMode.SetMapUnit( MAP_100TH_MM );
+aMapMode.SetOrigin( Point( -nTilePosX,
+ -nTilePosY) );
+aMapMode.SetScaleX( scaleX );
+aMapMode.SetScaleY( scaleY );
+
+rDevice.SetMapMode( aMapMode );
+
+rDevice.SetOutputSizePixel( Size(nOutputWidth, nOutputHeight) );
+mpDoc->GetDocSh()->GetViewShell()->GetView()->CompleteRedraw(
+&rDevice,
+Region(
+Rectangle( Point( nTilePosX, nTilePosY ),
+ Size( nTileWidth, nTileHeight ) ) ) );
+
+// TODO: Set page kind in frameview?
}
void SdXImpressDocument::setPart( int nPart )
{
-(void) nPart;
+DrawViewShell* pViewSh = dynamic_cast< DrawViewShell* >(
mpDoc->GetDocSh()->GetViewShell() );
+if (pViewSh)
+{
+pViewSh->SwitchPage( nPart );
+}
}
int SdXImpressDocument::getParts()
{
-return mpDoc->GetPageCount();
+// TODO: master pages?
+// Read: drviews1.cxx
+return mpDoc->GetSdPageCount(PK_STANDARD);
}
int SdXImpressDocument::getPart()
{
+DrawViewShell* pViewSh = dynamic_cast< DrawViewShell* >(
mpDoc->GetDocSh()->GetViewShell() );
+if (pViewSh)
+{
+return pViewSh->GetCurPageId();
+}
return 0;
}
Size SdXImpressDocument::getDocumentSize()
{
-return Size( 100, 100 );
+SdrPageView* pCurPageView =
mpDoc->GetDocSh()->GetViewShell()->GetView()->GetSdrPageView();
+Size aSize = pCurPageView->GetPageRect().GetSize();
+// Convert the size in 100th mm to TWIP
+// See paintTile above for further info.
+return Size( aSize.getWidth() * 1440l / 2540l, aSize.getHeight() * 1440l /
2540l );
}
commit 0ff0b9c0310d1541d1a7d02c2cc222da9191479b
Author: Andrzej Hunt
Date: Fri Jul 11 16:09:30 2014 +0200
LOK: use solar mutex for setPart.
Needed e.g. for changing slides in impress.
Change-Id: I2f5de40d4efbacde910e27225768979a98ff1c0a
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7b6197a..da551b4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -461,7 +461,11 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, int
nPart)
return;
}
-pDoc->setPart( nPart );
+Application::AcquireSolar
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editeng.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f9d00a5a9a2f6213889e8701c8a2104fe2b5d7f Author: Matúš Kukan Date: Fri Jul 11 15:53:25 2014 +0200 fdo#81058: Revert "Fix: EE_CHAR_COLOR to EE_CHAR_BKGCOLOR" Obviously, it's not safe to touch editeng :-/ This reverts commit f2d6eb4d96918de9b29a96749506b83b0e59293f. diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 3c5f9f1..7b4d94a 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2600,7 +2600,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont ) rSet.Put( SvxEscapementItem( rFont.GetEscapement(), rFont.GetPropr(), EE_CHAR_ESCAPEMENT ) ); rSet.Put( SvxWeightItem( rFont.GetWeight(), EE_CHAR_WEIGHT ) ); rSet.Put( SvxColorItem( rFont.GetColor(), EE_CHAR_COLOR ) ); -rSet.Put( SvxBackgroundColorItem( rFont.GetFillColor(), EE_CHAR_BKGCOLOR ) ); +rSet.Put( SvxBackgroundColorItem( rFont.GetFillColor(), EE_CHAR_COLOR ) ); rSet.Put( SvxUnderlineItem( rFont.GetUnderline(), EE_CHAR_UNDERLINE ) ); rSet.Put( SvxOverlineItem( rFont.GetOverline(), EE_CHAR_OVERLINE ) ); rSet.Put( SvxCrossedOutItem( rFont.GetStrikeout(), EE_CHAR_STRIKEOUT ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - framework/Library_fwk.mk framework/source sal/osl
framework/Library_fwk.mk |1
framework/source/uiconfiguration/imagemanagerimpl.cxx | 28 ++
framework/source/uiconfiguration/imagemanagerimpl.hxx | 10 +-
sal/osl/unx/mutex.c |2 -
4 files changed, 8 insertions(+), 33 deletions(-)
New commits:
commit 1fc3126439ca57a0c1c4897770e77281c5f325c3
Author: Noel Grandin
Date: Fri Jul 11 15:44:00 2014 +0200
convert GlobalImageList to SimpleReferenceObject
instead of hand-rolling it's own reference counting
Change-Id: Ie90cdce49b9dab68f1bdf487b0f308e03464f893
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index abfc7a9..74e72a9 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,fwk,\
fwi \
i18nlangtag \
sal \
+salhelper \
sot \
svl \
svt \
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 2e974e8..1c55653 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -310,13 +310,15 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/,
const OUString& rCommandU
}
GlobalImageList::GlobalImageList( const uno::Reference< uno::XComponentContext
>& rxContext ) :
-CmdImageList( rxContext, OUString() ),
-m_nRefCount( 0 )
+CmdImageList( rxContext, OUString() )
{
}
GlobalImageList::~GlobalImageList()
{
+osl::MutexGuard guard( getGlobalImageListMutex() );
+// remove global pointer as we destroy the object now
+pGlobalImageList = 0;
}
Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const
OUString& rCommandURL )
@@ -343,28 +345,6 @@ bool GlobalImageList::hasImage( sal_Int16 nImageType,
const OUString& rCommandUR
return impl_getImageCommandNameVector();
}
-oslInterlockedCount GlobalImageList::acquire()
-{
-osl_atomic_increment( &m_nRefCount );
-return m_nRefCount;
-}
-
-oslInterlockedCount GlobalImageList::release()
-{
-osl::MutexGuard guard( getGlobalImageListMutex() );
-
-if ( !osl_atomic_decrement( &m_nRefCount ))
-{
-oslInterlockedCount nCount( m_nRefCount );
-// remove global pointer as we destroy the object now
-pGlobalImageList = 0;
-delete this;
-return nCount;
-}
-
-return m_nRefCount;
-}
-
static bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >&
rOutGraphic, const uno::Reference< XGraphic >& rInGraphic, sal_Int16 nImageType
)
{
static Size aNormSize( IMAGE_SIZE_NORMAL, IMAGE_SIZE_NORMAL );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx
b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 362cfe1..93ee508 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -51,6 +51,7 @@
#include
#include
+#include
namespace framework
{
@@ -83,7 +84,7 @@ namespace framework
OUString
m_sIconTheme;
};
-class GlobalImageList : public CmdImageList, public rtl::IReference
+class GlobalImageList : public CmdImageList, public
salhelper::SimpleReferenceObject
{
public:
GlobalImageList( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
@@ -93,13 +94,6 @@ namespace framework
virtual boolhasImage( sal_Int16
nImageType, const OUString& rCommandURL ) SAL_OVERRIDE;
virtual ::std::vector< OUString >& getImageNames() SAL_OVERRIDE;
virtual ::std::vector< OUString >& getImageCommandNames()
SAL_OVERRIDE;
-
-// IReference
-virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
-virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
-
-private:
-oslInterlockedCount
m_nRefCount;
};
class ImageManagerImpl
commit 0a70789991152ca56007f56aaf44e85d14cc2dcf
Author: Noel Grandin
Date: Fri Jul 11 15:43:06 2014 +0200
complete shot-in-the-dark to fix tinderbox build
tinderbox 50 is failing, trying to fix it
Change-Id: I81e3cbdb224110af3036f5726228fd88aba32748
diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index 66a51509..a43f662 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -25,7 +25,7 @@
#include
#include
-#if defined LINUX && !((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 0)) /* bad hack
*/
+#if defined LINUX && (__GLIBC__ == 2) && (__GLIBC_MINOR__ <= 1) /* bad hack */
int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
#define pthread_mutexattr_settype pthread_mutexattr_setkind_np
#define PTHREAD_MUTEX_RE
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 81147, which changed state. Bug 81147 Summary: Assertion failure when right-clicking and selecting Area... on a graphic in Writer https://bugs.freedesktop.org/show_bug.cgi?id=81147 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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 - cui/source sw/source
cui/source/tabpages/tabarea.cxx |2 +-
cui/source/tabpages/tpcolor.cxx |4 +---
sw/source/core/doc/docnew.cxx |8
sw/source/uibase/app/docshdrw.cxx | 14 +-
4 files changed, 15 insertions(+), 13 deletions(-)
New commits:
commit 76631b6b9147dd83006a6382441d311f668f3286
Author: Caolán McNamara
Date: Fri Jul 11 14:08:19 2014 +0100
Resolves: fdo#81147 fix mismatching drawlayer and docshell colorlists
a bit of mis-merge + a bit of underlying crashiness
regression from 378dc6ef20ffd0e657d78dbf6646d48059be4045
Change-Id: Id0f7b6b6f13e1ec70dc900c21d2d020a44cf6081
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 9ebd797..60a4df3 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -678,14 +678,6 @@ void SwDoc::SetDocShell( SwDocShell* pDSh )
mpLinkMgr->SetPersist( mpDocShell );
-if( GetDocumentDrawModelManager().GetDrawModel() )
-{
-GetDocumentDrawModelManager().GetDrawModel()->SetObjectShell(
mpDocShell );
-GetDocumentDrawModelManager().GetDrawModel()->SetPersist(
mpDocShell );
-OSL_ENSURE(
GetDocumentDrawModelManager().GetDrawModel()->GetPersist() == GetPersist(),
-"draw model's persist is out of sync" );
-}
-
// set DocShell pointer also on DrawModel
InitDrawModelAndDocShell(mpDocShell,
GetDocumentDrawModelManager().GetDrawModel());
OSL_ENSURE(!GetDocumentDrawModelManager().GetDrawModel() ||
diff --git a/sw/source/uibase/app/docshdrw.cxx
b/sw/source/uibase/app/docshdrw.cxx
index 2fcfac1..00e7c2d 100644
--- a/sw/source/uibase/app/docshdrw.cxx
+++ b/sw/source/uibase/app/docshdrw.cxx
@@ -63,7 +63,19 @@ void InitDrawModelAndDocShell(SwDocShell* pSwDocShell,
SwDrawModel* pSwDrawDocum
else
{
// Use the ColorTable which is used at the DrawingLayer's
SdrModel
-
pSwDocShell->PutItem(SvxColorListItem(pSwDrawDocument->GetColorList(),
SID_COLOR_TABLE));
+XColorListRef xColorList = pSwDrawDocument->GetColorList();
+if (xColorList.is())
+{
+pSwDocShell->PutItem(SvxColorListItem(xColorList,
SID_COLOR_TABLE));
+}
+else
+{
+// there wasn't one, get the standard and set to the
+// docshell and then to the drawdocument
+xColorList = XColorList::GetStdColorList();
+pSwDocShell->PutItem(SvxColorListItem(xColorList,
SID_COLOR_TABLE));
+pSwDrawDocument->SetPropertyList(xColorList.get());
+}
}
// add other tables in SfxItemSet of the DocShell
commit 86de78ce5076ed00c6ad19eae7ab6da7c7a91196
Author: Caolán McNamara
Date: Fri Jul 11 14:07:53 2014 +0100
Related: fdo#81147 check if colorlist is valid
Change-Id: Ifd48526974b7fcb10872d53d42e26add3fe878d1
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 3fcdbce..3d3b3f8 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -191,7 +191,7 @@ void SvxAreaTabDialog::SavePalettes()
}
}
-if( mnColorListState & CT_MODIFIED )
+if (mnColorListState & CT_MODIFIED && mpColorList.is())
{
mpColorList->SetPath( aPath );
mpColorList->Save();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 52ead23..5c2ecd7 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -584,15 +584,13 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet )
void SvxColorTabPage::UpdateModified()
{
-bool bEnable = pColorList->Count();
+bool bEnable = pColorList.is() && pColorList->Count();
m_pBtnModify->Enable( bEnable );
m_pBtnWorkOn->Enable( bEnable );
m_pBtnDelete->Enable( bEnable );
EnableSave( bEnable );
}
-
-
void SvxColorTabPage::Reset( const SfxItemSet* rSet )
{
sal_uInt16 nState = rSet->GetItemState( XATTR_FILLCOLOR );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: memory release in libreoffice
Hi Mahesh, Please keep discussions on the mailing list instead of moving them to private mail only, I'm Cc'ing the list again. On Friday, 2014-07-11 12:28:43 -, Mahesh Patil wrote: > Mac OS Xcode has such tools which tell you memory leaks with exact num of > bytes and it's allocation function. > > I found some memory leaks but main problem is that I build static library on > mac and ConvertData is duplicate struct and class. So this causes problem > ConvertData destructor is not called properrly so I rename one of them in > scaddin.One random crash also found but I don't know how to contact mac os > developer on libreoffice. I know exact proble I fixed also.. I see struct ConvertData in include/vcl/salctype.hxx and class ConvertData in scaddins/source/analysis/analysishelper.hxx Both should be independent from each other, i.e. scaddins does not see the vcl struct or vice versa. Anyway, renaming the scaddin one helped in your static library case? (whyever you build a static lib is beyond my scope...) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpqkb8Ov4pGi.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sal/osl sw/source
sal/osl/unx/mutex.c |2 +-
sw/source/core/docnode/observablethread.cxx | 16 +---
sw/source/core/inc/observablethread.hxx | 13 +++--
3 files changed, 9 insertions(+), 22 deletions(-)
New commits:
commit c62e854ee40d427153b9f5d0c1d93b6ee0b13bfa
Author: Noel Grandin
Date: Fri Jul 11 14:41:02 2014 +0200
convert sw/ObservableThread to salhelper::SimpleReferenceObject
instead of re-implementing it's own reference counting
Change-Id: I2600b970544f1dfd84b987d1891c79e3c377bd1b
diff --git a/sw/source/core/docnode/observablethread.cxx
b/sw/source/core/docnode/observablethread.cxx
index ab225eb..2be12d4 100644
--- a/sw/source/core/docnode/observablethread.cxx
+++ b/sw/source/core/docnode/observablethread.cxx
@@ -25,8 +25,7 @@
#i73788#
*/
ObservableThread::ObservableThread()
-: mnRefCount( 0 ),
- mnThreadID( 0 ),
+: mnThreadID( 0 ),
mpThreadListener()
{
}
@@ -35,19 +34,6 @@ ObservableThread::~ObservableThread()
{
}
-oslInterlockedCount ObservableThread::acquire()
-{
-return osl_atomic_increment( &mnRefCount );
-}
-
-oslInterlockedCount ObservableThread::release()
-{
-oslInterlockedCount nCount( osl_atomic_decrement( &mnRefCount ) );
-if ( nCount == 0 )
-delete this;
-return nCount;
-}
-
void ObservableThread::SetListener( boost::weak_ptr< IFinishedThreadListener >
pThreadListener,
const oslInterlockedCount nThreadID )
{
diff --git a/sw/source/core/inc/observablethread.hxx
b/sw/source/core/inc/observablethread.hxx
index 4096f3c..13b4527 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
/** class for an observable thread
@@ -37,7 +38,7 @@
to notify, that the thread has finished its work.
*/
class ObservableThread : public osl::Thread,
- public rtl::IReference
+ public salhelper::SimpleReferenceObject
{
public:
@@ -46,9 +47,11 @@ class ObservableThread : public osl::Thread,
void SetListener( boost::weak_ptr< IFinishedThreadListener >
pThreadListener,
const oslInterlockedCount nThreadID );
-// IReference
-virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
-virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
+static inline void * operator new(std::size_t size)
+{ return SimpleReferenceObject::operator new(size); }
+
+static inline void operator delete(void * pointer)
+{ SimpleReferenceObject::operator delete(pointer); }
protected:
@@ -79,8 +82,6 @@ class ObservableThread : public osl::Thread,
private:
-oslInterlockedCount mnRefCount;
-
oslInterlockedCount mnThreadID;
boost::weak_ptr< IFinishedThreadListener > mpThreadListener;
commit 0cca713f69710d1312acdde9115b359dd8bfc010
Author: Noel Grandin
Date: Fri Jul 11 14:40:18 2014 +0200
attempt to fix linux build
on some older boxes, after my commit
dac4ca5 "new loplugin: externalandnotdefined"
Change-Id: Ibcab5f39714fb531066709e91a7322270995a6a5
diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.c
index f48e2e2..66a51509 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.c
@@ -25,7 +25,7 @@
#include
#include
-#if defined LINUX && !((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) /* bad hack
*/
+#if defined LINUX && !((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 0)) /* bad hack
*/
int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
#define pthread_mutexattr_settype pthread_mutexattr_setkind_np
#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo79968.docx |binary
sw/qa/extras/ooxmlexport/data/fdo79969_xlsb.docx |binary
sw/qa/extras/ooxmlexport/data/fdo79969_xlsm.docx |binary
sw/qa/extras/ooxmlexport/data/fdo80522.docx |binary
sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx |binary
sw/qa/extras/ooxmlexport/data/fdo80523_sldm.docx |binary
sw/qa/extras/ooxmlexport/data/fdo80898.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 96 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 43 ++
9 files changed, 139 insertions(+)
New commits:
commit 6b76a1855a60fce90eb09e3d40a79dca0c5901bd
Author: Dushyant Bhalgami
Date: Fri Jul 4 13:35:54 2014 +0530
fdo#80898:Fix for embedded obj 97-2003 MS Doc File
Added implementation for embedded Word 97-2003 document.
Change-Id: I47ec39f25beee9a37f2a1e914384bc458df31b78
Reviewed-on: https://gerrit.libreoffice.org/10078
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit 163b5fd59fe1e9b8c8a1bcac9dab069c0bcd27e9)
Signed-off-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80898.docx
b/sw/qa/extras/ooxmlexport/data/fdo80898.docx
new file mode 100644
index 000..d4b9e1f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80898.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index da32d57..312d9d9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3595,6 +3595,20 @@
DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
"/word/embeddings/oleObject1.sldm");
}
+DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
+{
+// This UT for DOCX embedded with binary excel work sheet.
+xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
+
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,
+
"/ContentType:Types/ContentType:Override[@ContentType='application/msword']",
+"PartName",
+"/word/embeddings/oleObject1.doc");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0e7538a..3b71536 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4199,6 +4199,13 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode,
const Size& rSize, const S
sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
sFileExtension = "docm";
}
+//Implementation for embedded Word 97-2003 document was missing
+else if( sProgID == "Word.Document.8" )
+{
+sMediaType = "application/msword";
+sRelationType =
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";;
+sFileExtension = "doc";
+}
else
{
sMediaType = "application/vnd.openxmlformats-officedocument.oleObject";
commit 1f9e3661ee2ca8334dc228c65cfc23442c2a9c39
Author: PriyankaGaikwad
Date: Thu Jun 26 18:07:26 2014 +0530
fdo#80522 & fdo#80523:Embedded Macro-Enabled objects are not preserved
Description :
fdo#80522
- DOCX contain embedded word Macro-Enabled document.
- Embedded word Macro-Enabled object is not preserved.
- .docm preserved as .bin so word Macro-Enabled document is converted to
picture.
fdo#80523
1) Embedded PowerPoint Macro-Enabled Slide
- DOCX contain embedded PowerPoint Macro-Enabled Slide
- Embedded PowerPoint Macro-Enabled Slide is not preserved.
- .sldm preserved as .bin so powerpoint Macro-Enabled slide is converted
to picture.
2) Embedded PowerPoint Macro-Enabled Presentation
- same case with embedded PowerPoint Macro-Enabled Presentation
- Embedded PowerPoint Macro-Enabled presentation is not preserved.
- .pptm preserved as .pptx so powerpoint Macro-Enabled presentation is
converted to picture .
Implementation :
Added sMediaType, sRelationType & sFileExtension for these embedded objects.
Change-Id: Ia58662ba921f3d940e8ead04a7f7ae83689a3b35
Reviewed-on: https://gerrit.libreoffice.org/9917
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit f11d6421e4e61ce6f557ebd8272485f79968224e)
Signed-off-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80522.docx
b/sw/qa/extras/ooxmlexport/data/fdo80522.docx
new file mode 100644
index 000..9445b73
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo80522.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx
b/sw/qa/extras/ooxmlexport/data/fdo80523_pptm.docx
new file mode 100644
index 000..3140f3b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo8052
[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_ado.mk connectivity/Library_ado.mk
connectivity/CppunitTest_connectivity_ado.mk |2 +- connectivity/Library_ado.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 28b6325901138a6267320902ec889fc434ddde91 Author: David Ostrovsky Date: Wed Jul 9 07:13:04 2014 +0200 VS2013: Make ADO backwards compatible for SDK > 8.0 Change-Id: I2e607156831321cc0ea5c3030befb635c5acaed1 Reviewed-on: https://gerrit.libreoffice.org/10156 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index ff090c4..1102d27 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_cxxflags,connectivity_ado,\ )) endif -ifeq ($(WINDOWS_SDK_VERSION),80) +ifneq (,$(filter $(WINDOWS_SDK_VERSION),80 81)) $(eval $(call gb_CppunitTest_add_defs,connectivity_ado,\ -DNTDDI_VERSION=0x0601 \ )) diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 054c478..dbe53b4 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,ado,\ )) endif -ifeq ($(WINDOWS_SDK_VERSION),80) +ifneq (,$(filter $(WINDOWS_SDK_VERSION),80 81)) $(eval $(call gb_Library_add_defs,ado,\ -DNTDDI_VERSION=0x0601 \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/lcms2
external/lcms2/ExternalProject_lcms2.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit a21d0d7d5c3886b6ae9b5a2f7241d1a4a7846f08 Author: David Ostrovsky Date: Tue Jul 8 21:44:12 2014 +0200 VS2013: Adjust lcms2 to 12.0 vcproj version Change-Id: I5ec1ea40e57c7d9de337645421be89e1e4c5a867 Reviewed-on: https://gerrit.libreoffice.org/10157 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 1712c96..fa61bb7 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -20,7 +20,8 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): MSBuild.exe lcms2_DLL.vcxproj \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=Win32 /p:TargetName=lcms2 \ - $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ + $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ + $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120) \ ,Projects/VC2010/lcms2_DLL) else $(call gb_ExternalProject_get_state_target,lcms2,build): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/python3
external/python3/ExternalProject_python3.mk |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 5a03dad45290a92941aab61ef03247c04b78154f Author: David Ostrovsky Date: Tue Jul 8 23:46:25 2014 +0200 VS2013: Adjust python3 to 12.0 vcproj version Change-Id: Ic4566e8a199d3f31d6d4cb2d3fd41ad7b762c02a Reviewed-on: https://gerrit.libreoffice.org/10162 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index f0b65ed..3eda350 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -35,10 +35,12 @@ $(call gb_ExternalProject_get_state_target,python3,build) : MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ - $(if $(filter 100,$(VCVER)), \ - /ToolsVersion:4.0, \ - /p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ + $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \ + /p:VisualStudioVersion=10.0) \ + $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ /p:VisualStudioVersion=11.0) \ + $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \ + /p:VisualStudioVersion=12.0) \ ,PCBuild) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - ucb/source
ucb/source/ucp/webdav/webdavcontent.cxx |6 ++
ucb/source/ucp/webdav/webdavcontent.hxx |4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 4467e9243818b111286fa013bba5b84cc0187160
Author: Matúš Kukan
Date: Fri Jul 11 12:54:02 2014 +0200
webdav: Do not return reference here.
This was missing in e07cefb4f7ba39d59d25815e208ed61269079142.
(cherry picked from commit 89df4412dcff84eb7ef77bf77b5db499ed44fb18)
Conflicts:
ucb/source/ucp/webdav/webdavcontent.cxx
Change-Id: I1c9a3f88981ee67d9d5748f9e43eed1237422fb1
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index e67b65e..d9ee9d8 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3360,8 +3360,7 @@ Content::getBaseURI( const boost::scoped_ptr<
DAVResourceAccess > & rResAccess )
return OUString( rResAccess->getURL() );
}
-//=
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv,
const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
bool * networkAccessAllowed )
@@ -3443,8 +3442,7 @@ const Content::ResourceType & Content::getResourceType(
return m_eResourceType;
}
-//=
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw ( uno::Exception )
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index b36d88d..7d7ac1e 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -125,12 +125,12 @@ private:
const OUString
getBaseURI( const boost::scoped_ptr< DAVResourceAccess > & rResAccess );
-const ResourceType &
+ResourceType
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv )
throw ( ::com::sun::star::uno::Exception );
-const ResourceType &
+ResourceType
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv,
const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libgltf
external/libgltf/ExternalProject_libgltf.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 705473c9bd787dff7b63f94a3a577b9510cb62af Author: David Ostrovsky Date: Tue Jul 8 23:45:53 2014 +0200 VS2013: Adjust libgltf to 12.0 vcproj version Change-Id: I076c998f5c843b60ac5624381e51271a0924043f Reviewed-on: https://gerrit.libreoffice.org/10161 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk index 3e390b9..25f57b8 100644 --- a/external/libgltf/ExternalProject_libgltf.mk +++ b/external/libgltf/ExternalProject_libgltf.mk @@ -43,6 +43,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) : $(call gb_ExternalProject_run,build,\ msbuild.exe libgltf.vcxproj \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ /p:VisualStudioVersion=11.0) \ $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glew
external/glew/ExternalProject_glew.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f4afc39514eeca61f56907b7fee1e82bf8d1c239 Author: David Ostrovsky Date: Tue Jul 8 23:44:57 2014 +0200 VS2013: Adjust glew to 12.0 vcproj version Change-Id: Ibfb6f7d23c0f3afbd7ef810093dbbec7f9134aaa Reviewed-on: https://gerrit.libreoffice.org/10160 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index de1ba93..d7e553b 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -17,7 +17,8 @@ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,build,\ msbuild.exe glew_shared.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ + $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ + $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \ ,build/vc10) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/cppunit
external/cppunit/ExternalProject_cppunit.mk |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 729e26426c88f9bba7e4d9b79d43fb4c9553d179
Author: David Ostrovsky
Date: Tue Jul 8 23:44:29 2014 +0200
VS2013: Adjust cppunit to 12.0 vcproj version
Change-Id: I9223fc0620bf31389ab4ea0971835dd7a27feb7e
Reviewed-on: https://gerrit.libreoffice.org/10159
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/external/cppunit/ExternalProject_cppunit.mk
b/external/cppunit/ExternalProject_cppunit.mk
index 9e67828..5c62c96 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -17,8 +17,9 @@ ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
- /p:VisualStudioVersion=11.0)" \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
+ /p:VisualStudioVersion=11.0) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0)" \
&& msbuild.exe cppunit_dll.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
&& cd ../DllPlugInTester \
&& msbuild.exe DllPlugInTester.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/ExternalProject_coinmp.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 83cfe896973075a2b07453d9de548f625511fa63 Author: David Ostrovsky Date: Tue Jul 8 23:43:41 2014 +0200 VS2013: Adjust coinmp to 12.0 vcproj version Change-Id: I3b069278297c489b0aeb54ebef484c73dee503c0 Reviewed-on: https://gerrit.libreoffice.org/10158 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index b483d45..c5f181d 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : /p:Platform=Win32 \ $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 /p:VisualStudioVersion=10.0) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ + $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \ ,CoinMP/MSVisualStudio/v9) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav/webdavcontent.cxx |4 ++--
ucb/source/ucp/webdav/webdavcontent.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 89df4412dcff84eb7ef77bf77b5db499ed44fb18
Author: Matúš Kukan
Date: Fri Jul 11 12:54:02 2014 +0200
webdav: Do not return reference here.
This was missing in e07cefb4f7ba39d59d25815e208ed61269079142.
Change-Id: I1c9a3f88981ee67d9d5748f9e43eed1237422fb1
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 3829a0c..99af57c 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3323,7 +3323,7 @@ Content::getBaseURI( const boost::scoped_ptr<
DAVResourceAccess > & rResAccess )
}
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv,
const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
bool * networkAccessAllowed )
@@ -3406,7 +3406,7 @@ const Content::ResourceType & Content::getResourceType(
}
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw ( uno::Exception )
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index f6e0639..3f6c2cb 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -125,12 +125,12 @@ private:
const OUString
getBaseURI( const boost::scoped_ptr< DAVResourceAccess > & rResAccess );
-const ResourceType &
+ResourceType
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv )
throw ( ::com::sun::star::uno::Exception );
-const ResourceType &
+ResourceType
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv,
const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - ucb/source
ucb/source/ucp/webdav/webdavcontent.cxx | 120 +---
ucb/source/ucp/webdav/webdavcontent.hxx |4 -
2 files changed, 68 insertions(+), 56 deletions(-)
New commits:
commit 9f1f7a6bf2fa0aa6ebe2907c38a2e5b56b1dacac
Author: Matúš Kukan
Date: Tue Jun 24 17:22:34 2014 +0200
webdav: Do not call into DAVResourceAccess with mutex locked.
This commit cherry-picks 0c3500115c4fd86284a027fc32be704afcf77061
for serf webdav version.
(cherry picked from commit e07cefb4f7ba39d59d25815e208ed61269079142)
Change-Id: I108b0068cad847bf4947ece5e690f789ef034ae9
Reviewed-on: https://gerrit.libreoffice.org/9889
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 8cc72bb..99c5e0f 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1472,8 +1472,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
}
catch ( DAVException const & e )
{
-bNetworkAccessAllowed
-= shouldAccessNetworkAfterException( e );
+bNetworkAccessAllowed = bNetworkAccessAllowed &&
+shouldAccessNetworkAfterException( e );
if ( !bNetworkAccessAllowed )
{
@@ -3323,78 +3323,90 @@ Content::getBaseURI( const boost::scoped_ptr<
DAVResourceAccess > & rResAccess )
}
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv,
const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
bool * networkAccessAllowed )
throw ( uno::Exception )
{
-if ( m_eResourceType == UNKNOWN )
{
-osl::Guard< osl::Mutex > aGuard( m_aMutex );
+osl::MutexGuard g(m_aMutex);
+if (m_eResourceType != UNKNOWN) {
+return m_eResourceType;
+}
+}
-ResourceType eResourceType = UNKNOWN;
+ResourceType eResourceType = UNKNOWN;
-try
+try
+{
+// Try to fetch some frequently used property value, e.g. those
+// used when loading documents... along with identifying whether
+// this is a DAV resource.
+std::vector< DAVResource > resources;
+std::vector< OUString > aPropNames;
+uno::Sequence< beans::Property > aProperties( 5 );
+aProperties[ 0 ].Name = "IsFolder";
+aProperties[ 1 ].Name = "IsDocument";
+aProperties[ 2 ].Name = "IsReadOnly";
+aProperties[ 3 ].Name = "MediaType";
+aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK;
+
+ContentProperties::UCBNamesToDAVNames(
+aProperties, aPropNames );
+
+rResAccess->PROPFIND(
+DAVZERO, aPropNames, resources, xEnv );
+
+// TODO - is this really only one?
+if ( resources.size() == 1 )
{
-// Try to fetch some frequently used property value, e.g. those
-// used when loading documents... along with identifying whether
-// this is a DAV resource.
-std::vector< DAVResource > resources;
-std::vector< OUString > aPropNames;
-uno::Sequence< beans::Property > aProperties( 5 );
-aProperties[ 0 ].Name = "IsFolder";
-aProperties[ 1 ].Name = "IsDocument";
-aProperties[ 2 ].Name = "IsReadOnly";
-aProperties[ 3 ].Name = "MediaType";
-aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK;
-
-ContentProperties::UCBNamesToDAVNames(
-aProperties, aPropNames );
-
-rResAccess->PROPFIND(
-DAVZERO, aPropNames, resources, xEnv );
-
-// TODO - is this really only one?
-if ( resources.size() == 1 )
-{
-m_xCachedProps.reset(
-new CachableContentProperties( resources[ 0 ] ) );
-m_xCachedProps->containsAllNames(
-aProperties, m_aFailedPropNames );
-}
+osl::MutexGuard g(m_aMutex);
+m_xCachedProps.reset(
+new CachableContentProperties( resources[ 0 ] ) );
+m_xCachedProps->containsAllNames(
+aProperties, m_aFailedPropNames );
+}
-eResourceType = DAV;
+eResourceType = DAV;
+}
+catch ( DAVException const & e )
+{
+rResAccess->resetUri();
+
+if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
+{
+// Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
+// resource is NON_DAV
+eResourceType = NON_DAV;
}
-catch ( DAVException const & e )
+else if
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - ucb/source
ucb/source/ucp/webdav/webdavcontent.cxx | 16 ++--
ucb/source/ucp/webdav/webdavcontent.hxx |3 ++-
2 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit d2001cad7f117de66837a884ec5185cb473216e3
Author: Matúš Kukan
Date: Mon Jun 23 10:39:49 2014 +0200
webdav: Do not throw when saving new document.
Propagate information about !shouldAccessNetworkAfterException
from getResourceType out to getPropertyValues, to avoid further calls
which would result in cancelCommandExecution, when trying get properties
of document which does not exist yet, but we want to create it.
This was done in webdav-neon for other reasons as part of
0c3500115c4fd86284a027fc32be704afcf77061.
Change-Id: Ia434a707d2946a6982075f9bf53904b78dc07a5e
(cherry picked from commit 96e23564e95d2ecc5483e55b022c8a4db04d116b)
Reviewed-on: https://gerrit.libreoffice.org/9888
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 3d720b7..8cc72bb 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1375,14 +1375,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( !m_bTransient && !bHasAll )
{
-
// Obtain values from server...
// First, identify whether resource is DAV or not
-const ResourceType & rType = getResourceType( xEnv, xResAccess );
-
bool bNetworkAccessAllowed = true;
+const ResourceType & rType = getResourceType( xEnv, xResAccess,
&bNetworkAccessAllowed );
if ( DAV == rType )
{
@@ -3327,15 +3325,15 @@ Content::getBaseURI( const boost::scoped_ptr<
DAVResourceAccess > & rResAccess )
const Content::ResourceType & Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv,
-const boost::scoped_ptr< DAVResourceAccess > & rResAccess )
+const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
+bool * networkAccessAllowed )
throw ( uno::Exception )
{
if ( m_eResourceType == UNKNOWN )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
-ResourceType eResourceType;
-eResourceType = m_eResourceType;
+ResourceType eResourceType = UNKNOWN;
try
{
@@ -3378,6 +3376,12 @@ const Content::ResourceType & Content::getResourceType(
// resource is NON_DAV
eResourceType = NON_DAV;
}
+else if (networkAccessAllowed != 0)
+{
+*networkAccessAllowed = *networkAccessAllowed
+&& shouldAccessNetworkAfterException(e);
+}
+
// cancel command execution is case that no user authentication
data has been provided.
if ( e.getError() == DAVException::DAV_HTTP_NOAUTH )
{
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index daa948c..f6e0639 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -133,7 +133,8 @@ private:
const ResourceType &
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv,
- const boost::scoped_ptr< DAVResourceAccess > & rResAccess
)
+ const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
+ bool * networkAccessAllowed = 0 )
throw ( ::com::sun::star::uno::Exception );
// Command "open"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - desktop/source
desktop/source/lib/init.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit e4ef020b7e7c4d97136dc69f97ddfee44c8fdae5
Author: Andrzej Hunt
Date: Thu Jul 10 12:19:36 2014 +0200
Check whether Command Args are already set up before doing so.
Could already be set up e.g. if a client application is using UNO
separately, in addition to LOK.
Change-Id: I50c3230b6f2456360273902a308c303576baac10
Signed-off-by: Michael Meeks
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 964aa3b..b78487a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -412,7 +412,14 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
try
{
-osl_setCommandArgs(0, NULL);
+// If we've set up the command args elsewhere then we cannot do it
+// again (as an assert will fire), this will be the case e.g.
+// for unit tests (and possibly if UNO is being used in addition
+// to LOK in an external program).
+if (!osl_areCommandArgsSet())
+{
+osl_setCommandArgs(0, NULL);
+}
initialize_uno(aAppURL);
force_c_locale();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 390f842de17755fc5f67b60fc638324b33aa1d96
Author: Andrzej Hunt
Date: Thu Jul 10 12:19:36 2014 +0200
Check whether Command Args are already set up before doing so.
Could already be set up e.g. if a client application is using UNO
separately, in addition to LOK.
Change-Id: I50c3230b6f2456360273902a308c303576baac10
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 88d618c..273446f1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -577,7 +577,14 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
try
{
-osl_setCommandArgs(0, NULL);
+// If we've set up the command args elsewhere then we cannot do it
+// again (as an assert will fire), this will be the case e.g.
+// for unit tests (and possibly if UNO is being used in addition
+// to LOK in an external program).
+if (!osl_areCommandArgsSet())
+{
+osl_setCommandArgs(0, NULL);
+}
initialize_uno(aAppURL);
force_c_locale();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/osl sal/osl sal/util
include/osl/process.h|5 +
sal/osl/unx/process_impl.cxx |5 +
sal/osl/w32/process.cxx |6 ++
sal/util/sal.map |1 +
4 files changed, 17 insertions(+)
New commits:
commit df86885a1478914f43b8bd4e1418cb39e44c0b0e
Author: Andrzej Hunt
Date: Thu Jul 10 12:17:05 2014 +0200
Introduce osl_areCommandArgsSet.
We cannot call osl_setCommandArgs twice, however there is currently
no way to determine whether or not this has already been done. This is
necessary e.g. for LibreOfficeKit where we may also be using UNO
separately (and also for unit tests where LO is already set-up prior
to the unit test running, and therefore we can't set up osl again
from within LOK).
Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb
Signed-off-by: Michael Meeks
diff --git a/include/osl/process.h b/include/osl/process.h
index 7d0960e..7fb619f 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -366,6 +366,11 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL
osl_getCommandArgCount(void);
SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getCommandArg(
sal_uInt32 nArg, rtl_uString **strCommandArg);
+/** Determine whether or not the command args have already been set.
+@return The command args are already set, and may not be set again.
+*/
+SAL_DLLPUBLIC int SAL_CALL osl_areCommandArgsSet (void);
+
/** Set the command-line arguments as passed to the main-function of this
process.
Deprecated: This function is only for internal use. Passing the args from
main will
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index d28f46d..b63f222 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -191,6 +191,11 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32
nArg, rtl_uString ** strC
return (result);
}
+int SAL_CALL osl_areCommandArgsSet (void)
+{
+return (g_command_args.m_nCount > 0);
+}
+
/***
osl_setCommandArgs().
**/
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 3dd0e77..25f4e58 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -374,6 +374,12 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32
nArg, rtl_uString **strCo
/***/
+int SAL_CALL osl_areCommandArgsSet(void)
+{
+return (g_command_args.m_nCount > 0);
+}
+
+
void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
osl_acquireMutex (*osl_getGlobalMutex());
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 1d7d491..6acd9c4 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -675,6 +675,7 @@ LIBO_UDK_4.3 { # symbols available in >= LibO 4.3
osl_createDirectoryWithFlags;
rtl_allocateAlignedMemory;
rtl_freeAlignedMemory;
+osl_areCommandArgsSet;
} LIBO_UDK_4.2;
PRIVATE_1.0 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docsh8.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 972c92c84e6f95e8fa8818794280a16e681e5edd
Author: Eike Rathke
Date: Fri Jul 11 12:25:58 2014 +0200
CID#982304 logically dead code
Change-Id: I8ffc8249a4d1b7530ee208cf84b48af832758a4d
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 570e0d6..ef8e78b 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -686,11 +686,20 @@ void lcl_GetColumnTypes(
}
else
{
+#if 1
+// Adjust length to predefined precision.
+nLen = nLen + ( nPrecision - nPrec );
+#else
+/* If the above override for (nPrecision < nPrec) was not in place then
+ * nPrecision could be 0 and this would be the code path to correctly
+ * calculate nLen. But as is, nPrecision is never 0 here, see CID#982304 */
+
// Adjust length to predefined precision.
if ( nPrecision )
nLen = nLen + ( nPrecision - nPrec );
else
nLen -= nPrec+1;// also remove the decimal
separator
+#endif
}
}
if (nFieldLen < nLen)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/sc.hrc |8 +++-
sc/source/ui/inc/retypepassdlg.hrc | 29 -
sc/source/ui/miscdlgs/retypepassdlg.cxx |2 +-
sc/source/ui/miscdlgs/retypepassdlg.src |2 +-
4 files changed, 9 insertions(+), 32 deletions(-)
New commits:
commit 2a17daf8a1fb1e83c11fd4c74da62518b27bb025
Author: Caolán McNamara
Date: Fri Jul 11 11:08:23 2014 +0100
move the retype strings to sc.hrc
Change-Id: I70bbbac0dff8c64bedcf8a46006378291a7fac23
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 5204efb..f420815 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -985,7 +985,13 @@
#define STR_SOUTH (STR_START + 432)
#define STR_SUM (STR_START + 433)
#define SCSTR_UPDATE_EXTDOCS(STR_START + 434)
-#define STR_END (SCSTR_UPDATE_EXTDOCS)
+#define STR_NOT_PROTECTED (STR_START + 435)
+#define STR_NOT_PASS_PROTECTED (STR_START + 436)
+#define STR_HASH_BAD(STR_START + 437)
+#define STR_HASH_GOOD (STR_START + 438)
+#define STR_HASH_REGENERATED(STR_START + 439)
+#define STR_RETYPE (STR_START + 440)
+#define STR_END (STR_RETYPE)
#define BMP_START (STR_END)
diff --git a/sc/source/ui/inc/retypepassdlg.hrc
b/sc/source/ui/inc/retypepassdlg.hrc
deleted file mode 100644
index c509291..000
--- a/sc/source/ui/inc/retypepassdlg.hrc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-
-#define STR_NOT_PROTECTED 256
-#define STR_NOT_PASS_PROTECTED 257
-#define STR_HASH_BAD258
-#define STR_HASH_GOOD 259
-#define STR_HASH_REGENERATED260
-#define STR_RETYPE 261
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx
b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 76a4a71..a029bae 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sc.hrc"
#include "retypepassdlg.hxx"
-#include "retypepassdlg.hrc"
#include "scresid.hxx"
#include "document.hxx"
#include "tabprotection.hxx"
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src
b/sc/source/ui/miscdlgs/retypepassdlg.src
index b88dde7..20beed4 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "retypepassdlg.hrc"
+#include "sc.hrc"
String STR_NOT_PROTECTED
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/osl sal/osl sal/util
include/osl/process.h|5 +
sal/osl/unx/process_impl.cxx |5 +
sal/osl/w32/process.cxx |6 ++
sal/util/sal.map |1 +
4 files changed, 17 insertions(+)
New commits:
commit 7fd7b7af26952676d8fcff6b56a081aac681d804
Author: Andrzej Hunt
Date: Thu Jul 10 12:17:05 2014 +0200
Introduce osl_areCommandArgsSet.
We cannot call osl_setCommandArgs twice, however there is currently
no way to determine whether or not this has already been done. This is
necessary e.g. for LibreOfficeKit where we may also be using UNO
separately (and also for unit tests where LO is already set-up prior
to the unit test running, and therefore we can't set up osl again
from within LOK).
Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb
diff --git a/include/osl/process.h b/include/osl/process.h
index 7d0960e..7fb619f 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -366,6 +366,11 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL
osl_getCommandArgCount(void);
SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getCommandArg(
sal_uInt32 nArg, rtl_uString **strCommandArg);
+/** Determine whether or not the command args have already been set.
+@return The command args are already set, and may not be set again.
+*/
+SAL_DLLPUBLIC int SAL_CALL osl_areCommandArgsSet (void);
+
/** Set the command-line arguments as passed to the main-function of this
process.
Deprecated: This function is only for internal use. Passing the args from
main will
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index d28f46d..b63f222 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -191,6 +191,11 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32
nArg, rtl_uString ** strC
return (result);
}
+int SAL_CALL osl_areCommandArgsSet (void)
+{
+return (g_command_args.m_nCount > 0);
+}
+
/***
osl_setCommandArgs().
**/
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 3dd0e77..25f4e58 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -374,6 +374,12 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32
nArg, rtl_uString **strCo
/***/
+int SAL_CALL osl_areCommandArgsSet(void)
+{
+return (g_command_args.m_nCount > 0);
+}
+
+
void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
osl_acquireMutex (*osl_getGlobalMutex());
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 1d7d491..6acd9c4 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -675,6 +675,7 @@ LIBO_UDK_4.3 { # symbols available in >= LibO 4.3
osl_createDirectoryWithFlags;
rtl_allocateAlignedMemory;
rtl_freeAlignedMemory;
+osl_areCommandArgsSet;
} LIBO_UDK_4.2;
PRIVATE_1.0 {
___
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-6' - filter/source
filter/source/msfilter/eschesdo.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 52772b80988952d176fa57075e674df06356d43d Author: Markus Mohrhard Date: Sun Dec 8 00:05:59 2013 +0100 fdo#80201: msfilter: fix infinite loop during export (regression from 6c5557c60f97778fd732c01f054553356ce7f258) (cherry picked from commit 86b9f03c3f754f7b753893ff2772f6b17bf3de3c) Signed-off-by: Michael Stahl Change-Id: I75bfafbc7343aaddbbc5c7433e28b5d4154177dc (cherry picked from commit 11d6ae6df8dfff1db182ac455d4abcaf7c18ded1) Reviewed-on: https://gerrit.libreoffice.org/10209 Reviewed-by: Miklos Vajna Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 25efbad..0e20dfb 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -101,6 +101,8 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty // for position calculations, we normalize the angle between 0 and 90 degrees if ( nAngle < 0 ) nAngle = ( 36000 + nAngle ) % 36000; +if ( nAngle % 18000 == 0 ) +nAngle = 0; while ( nAngle > 9000 ) nAngle = ( 18000 - ( nAngle % 18000 ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/source
setup_native/source/packinfo/packinfo_brand.txt | 16 ++--- setup_native/source/packinfo/packinfo_office_help.txt |2 - setup_native/source/packinfo/packinfo_office_lang.txt | 22 +- 3 files changed, 20 insertions(+), 20 deletions(-) New commits: commit e003e9a99f04f1b62432c34deb55a6644d91d88c Author: Joren De Cuyper Date: Fri Jul 11 11:52:58 2014 +0200 fdo#81218 - update Copyright year in DEB files Change-Id: Id8d83c09535e79146d65d615e85f0f18535b95d5 Reviewed-on: https://gerrit.libreoffice.org/10223 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt index e53dad2..8935984 100644 --- a/setup_native/source/packinfo/packinfo_brand.txt +++ b/setup_native/source/packinfo/packinfo_brand.txt @@ -22,7 +22,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01 %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02 %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03 %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04 %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05 %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06 %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07 %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-images %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")" -copyright = "2012 The Document Foundation" +copyright = "2014 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -36,7 +36,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer" -copyright = "2012 The Document Foundation" +copyright = "2014 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -50,7 +50,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc" -copyright = "2012 The Document Foundation" +copyright = "2014 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -64,7 +64,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress" -copyright = "2012 The Document Foun
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salframeview.mm |2 ++
1 file changed, 2 insertions(+)
New commits:
commit eefcbdcfdeafd23d5a002d0718d8574453f87458
Author: rbuj
Date: Tue Jul 8 01:03:00 2014 +0200
-Wdeprecated-declarations: first deprecated in OS X 10.10
vcl/osx/salframeview.mm:201:16: warning: 'useOptimizedDrawing:' is
deprecated: first deprecated in OS X 10.10 [-Wdeprecated-declarations]
Change-Id: I6025de6c23a73c625ddfe8398dfd91bd838fe83c
Reviewed-on: https://gerrit.libreoffice.org/10122
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 76fc384..57d251f 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -198,7 +198,9 @@ static AquaSalFrame* getMouseContainerFrame()
{ static_cast(pFrame->maGeometry.nWidth),
static_cast(pFrame->maGeometry.nHeight) } };
pFrame->VCLToCocoa( aRect );
NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask:
mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ];
+#if MACOSX_SDK_VERSION < 101000
[pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are
no overlapping subviews within the receiver
+#endif
// enable OSX>=10.7 fullscreen options if available and useful
bool bAllowFullScreen = (0 == (mpFrame->mnStyle & (SAL_FRAME_STYLE_DIALOG
| SAL_FRAME_STYLE_TOOLTIP | SAL_FRAME_STYLE_SYSTEMCHILD | SAL_FRAME_STYLE_FLOAT
| SAL_FRAME_STYLE_TOOLWINDOW | SAL_FRAME_STYLE_INTRO)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/printaccessoryview.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 402bde9397e98d464aa4f30a46fbff3cea958058
Author: rbuj
Date: Tue Jul 8 00:59:01 2014 +0200
-Wdeprecated-declarations: first deprecated in OS X 10.10
vcl/osx/printaccessoryview.mm:362:37: warning: 'NSScaleProportionally' is
deprecated: first deprecated in OS X 10.10 - Use NSImageScaleProportionallyDown
instead [-Wdeprecated-declarations]
Available in OS X v10.0 and later. Deprecated in OS X v10.10.
enum {
NSScaleProportionally = 0,
NSScaleToFit,
NSScaleNone
};
Available in OS X v10.5 and later.
enum {
NSImageScaleProportionallyDown = 0,
NSImageScaleAxesIndependently,
NSImageScaleNone,
NSImageScaleProportionallyUpOrDown
};
Change-Id: I457196e3e8f2ebcc10e9e0fa87755e5e3dba207c
Reviewed-on: https://gerrit.libreoffice.org/10121
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 1ee2190..6838232 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -359,7 +359,7 @@ class ControllerProperties
aPreviewFrame.size.width -= 2*(aMargins.width+1);
aPreviewFrame.size.height -= 61;
mpPreview = [[NSImageView alloc] initWithFrame: aPreviewFrame];
-[mpPreview setImageScaling: NSScaleProportionally];
+[mpPreview setImageScaling: NSImageScaleProportionallyDown];
[mpPreview setImageAlignment: NSImageAlignCenter];
[mpPreview setImageFrameStyle: NSImageFrameNone];
[mpPreviewBox addSubview: [mpPreview autorelease]];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/SalAquaFilePicker.mm |8
fpicker/source/aqua/SalAquaFolderPicker.mm |8
2 files changed, 16 insertions(+)
New commits:
commit 17458019baa564c96dcd5e0bc73339c779456f94
Author: rbuj
Date: Mon Jul 7 18:18:44 2014 +0200
-Wdeprecated-declarations: first deprecated in OS X 10.10
fpicker/source/aqua/SalAquaFilePicker.mm:220:14: warning: 'NSOKButton' is
deprecated: first deprecated in OS X 10.10 - Use NSModalResponseOK instead
[-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFilePicker.mm:225:14: warning: 'NSCancelButton'
is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseCancel
instead [-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFolderPicker.mm:114:10: warning: 'NSOKButton' is
deprecated: first deprecated in OS X 10.10 - Use NSModalResponseOK instead
[-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFolderPicker.mm:119:10: warning:
'NSCancelButton' is deprecated: first deprecated in OS X 10.10 - Use
NSModalResponseCancel instead [-Wdeprecated-declarations]
Change-Id: Ib497903e4df868867cc56e2eade7bb2572f0902a
Reviewed-on: https://gerrit.libreoffice.org/10115
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm
b/fpicker/source/aqua/SalAquaFilePicker.mm
index 3681434..3e69877 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -217,12 +217,20 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw(
uno::RuntimeException )
switch( nStatus )
{
+#if MACOSX_SDK_VERSION >= 101000
+case NSModalResponseOK:
+#else
case NSOKButton:
+#endif
OSL_TRACE("The dialog returned OK");
retVal = ExecutableDialogResults::OK;
break;
+#if MACOSX_SDK_VERSION >= 101000
+case NSModalResponseCancel:
+#else
case NSCancelButton:
+#endif
OSL_TRACE("The dialog was cancelled by the user!");
retVal = ExecutableDialogResults::CANCEL;
break;
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm
b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 6ad8c73..44f3abc 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -111,12 +111,20 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw(
uno::RuntimeException )
switch( nResult )
{
+#if MACOSX_SDK_VERSION >= 101000
+case NSModalResponseOK:
+#else
case NSOKButton:
+#endif
OSL_TRACE("Dialog returned with OK");
retVal = ExecutableDialogResults::OK;
break;
+#if MACOSX_SDK_VERSION >= 101000
+case NSModalResponseCancel:
+#else
case NSCancelButton:
+#endif
OSL_TRACE("Dialog was cancelled!");
retVal = ExecutableDialogResults::CANCEL;
break;
___
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
helpers/help_hid.lst |6 -- 1 file changed, 6 deletions(-) New commits: commit c7229c8a250f7387c090f20a0fd9171fdcd576d1 Author: Caolán McNamara Date: Fri Jul 11 11:09:51 2014 +0100 drop unused helpids Change-Id: Id7446d78c58d4086926192fc38b89b66b16ba04d diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 06738f4..e22f90b 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5140,18 +5140,12 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974, sc_ModalDialog_RID_SCDLG_GROUP,1493549056, -sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592, sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735, sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283, sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284, -sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_DOC,1495667213, -sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET1,1495667315, -sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318, -sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET3,1495667321, -sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324, sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107, sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106, sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105, ___ 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 a3271394b5a537f4831a7bdd4f6b668511dec1ba Author: Caolán McNamara Date: Fri Jul 11 11:09:51 2014 +0100 Updated core Project: help c7229c8a250f7387c090f20a0fd9171fdcd576d1 diff --git a/helpcontent2 b/helpcontent2 index 9f3d8e1..c7229c8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9f3d8e13a9180997db0bc525030fbc5e8ba59f21 +Subproject commit c7229c8a250f7387c090f20a0fd9171fdcd576d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/source/ui/inc/retypepassdlg.hrc | 40
sc/source/ui/inc/retypepassdlg.hxx | 36
sc/source/ui/miscdlgs/retypepassdlg.cxx | 260 ++-
sc/source/ui/miscdlgs/retypepassdlg.src | 217 ++---
sc/uiconfig/scalc/ui/retypepassdialog.ui | 239
6 files changed, 362 insertions(+), 431 deletions(-)
New commits:
commit 91ebd8825bf0ac6bf3daaba54cefc1a11a64451d
Author: Palenik Mihály
Date: Thu Jul 10 02:39:43 2014 +0200
Convert RID_SCDLG_RETYPEPASS to .ui
Change-Id: I5d6e1ba67bf04c4a10e92f203fcbf36b58a8801c
Reviewed-on: https://gerrit.libreoffice.org/10178
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index ab736b8..1de1c02 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -135,6 +135,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/queryrunstreamscriptdialog \
sc/uiconfig/scalc/ui/randomnumbergenerator \
+ sc/uiconfig/scalc/ui/retypepassdialog \
sc/uiconfig/scalc/ui/retypepassworddialog \
sc/uiconfig/scalc/ui/rightfooterdialog \
sc/uiconfig/scalc/ui/rightheaderdialog \
diff --git a/sc/source/ui/inc/retypepassdlg.hrc
b/sc/source/ui/inc/retypepassdlg.hrc
index 09c88ec..c509291 100644
--- a/sc/source/ui/inc/retypepassdlg.hrc
+++ b/sc/source/ui/inc/retypepassdlg.hrc
@@ -19,39 +19,11 @@
#include
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-
-#define FT_DESC 10
-#define FL_DOCUMENT 11
-#define FT_DOCSTATUS12
-#define BTN_RETYPE_DOC 13
-
-#define FL_SHEET112
-
-#define FT_SHEETNAME1 113
-#define FT_SHEETSTATUS1 114
-#define BTN_RETYPE_SHEET1 115
-
-#define FT_SHEETNAME2 116
-#define FT_SHEETSTATUS2 117
-#define BTN_RETYPE_SHEET2 118
-
-#define FT_SHEETNAME3 119
-#define FT_SHEETSTATUS3 120
-#define BTN_RETYPE_SHEET3 121
-
-#define FT_SHEETNAME4 122
-#define FT_SHEETSTATUS4 123
-#define BTN_RETYPE_SHEET4 124
-
-#define SB_SCROLL 190
-
-#define STR_NOT_PROTECTED 200
-#define STR_NOT_PASS_PROTECTED 201
-#define STR_HASH_BAD202
-#define STR_HASH_GOOD 203
-#define STR_HASH_REGENERATED204
+#define STR_NOT_PROTECTED 256
+#define STR_NOT_PASS_PROTECTED 257
+#define STR_HASH_BAD258
+#define STR_HASH_GOOD 259
+#define STR_HASH_REGENERATED260
+#define STR_RETYPE 261
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/retypepassdlg.hxx
b/sc/source/ui/inc/retypepassdlg.hxx
index f06839d..a01b791 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -63,41 +63,20 @@ private:
void PopulateDialog();
void SetDocData();
void SetTableData(size_t nRowPos, SCTAB nTab);
-void ResetTableRows();
/** Check the status of all hash values to see if it's okay to enable
the OK button. */
void CheckHashStatus();
-private:
-OKButtonmaBtnOk;
-CancelButtonmaBtnCancel;
-HelpButton maBtnHelp;
-
-FixedInfo maTextDescription;
-
-FixedLine maLineDocument;
-FixedText maTextDocStatus;
-PushButton maBtnRetypeDoc;
-
-FixedLine maLineSheet;
-FixedText maTextSheetName1;
-FixedText maTextSheetStatus1;
-PushButton maBtnRetypeSheet1;
+void DeleteSheets();
-FixedText maTextSheetName2;
-FixedText maTextSheetStatus2;
-PushButton maBtnRetypeSheet2;
-
-FixedText maTextSheetName3;
-FixedText maTextSheetStatus3;
-PushButton maBtnRetypeSheet3;
-
-FixedText maTextSheetName4;
-FixedText maTextSheetStatus4;
-PushButton maBtnRetypeSheet4;
+private:
+OKButton* mpBtnOk;
+FixedText* mpTextDocStatus;
+PushButton* mpBtnRetypeDoc;
+VclVBox*mpSheetsBox;
-ScrollBar maScrollBar;
+std::vector maSheets;
OUStringmaTextNotProtected;
OUStringmaTextNotPassProtected;
@@ -107,7 +86,6 @@ private:
DECL_LINK( OKHdl, void* );
DECL_LINK( RetypeBtnHdl, PushButton* );
-DECL_LINK( ScrollHdl, void* );
struct TableItem
{
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx
b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 164e413..76a4a71 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -28,35 +28,7 @@
#include
ScRetypePassDlg::ScRetypePassDlg(Window* pParent) :
-ModalDialog(pParent, ScResId(RID_SCDLG_RETYPEPASS)),
-
-maB
[Libreoffice-commits] core.git: sc/inc
sc/inc/styleuno.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2df4f9425cf71aee638b4b9cb2498655483b417d Author: Jacobo Aragunde Pérez Date: Fri Jul 11 11:53:47 2014 +0200 sc: syntax fix Change-Id: Ie3cfad9f39d55095fce638a33ee6383c967d5475 diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index da1e82b..d8234d3 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -98,7 +98,7 @@ public: getStyleLoaderOptions() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XStyleLoader2 -virtual void SAL_CALL loadStylesFromDocument( const ::com::sun::star::uno::Reference <::com::sun::star::lang::XComponent> & aSourceComponent, +virtual void SAL_CALL loadStylesFromDocument( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XComponent > & aSourceComponent, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions ) throw(::com::sun::star::io::IOException, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - avmedia/source
avmedia/source/opengl/oglplayer.cxx |4 1 file changed, 4 insertions(+) New commits: commit 6174152cfffd8e31b9eda238990a161c8c2b9a71 Author: Zolnai Tamás Date: Fri Jul 11 07:53:19 2014 +0200 glTF: crash after starting a model without an OpenGL window Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index a4aa783..a602d3c 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -144,6 +144,9 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception ) osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); +if(!m_pOGLWindow) +return; + // gltf_animation_start play animation from the time 0.0, // but OGLPlayer::start used as play from that time where it was stopped before double fTime = gltf_animation_get_time(m_pHandle); commit 30fcee6ce56ec4e50ee86c308ca5621746d817d5 Author: Zolnai Tamás Date: Fri Jul 11 11:23:29 2014 +0200 glTF: Removing one model breaks an other model Reproduce: - Insert two models - Play first model - Delete second model Result: crash (windows) or first model disappear from the opengl window (linux). Change-Id: I940960754f42a2e4faf5b9f37c0d4a3c155e4650 diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 3f33a6c..a4aa783 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -44,6 +44,7 @@ OGLPlayer::~OGLPlayer() delete [] m_pHandle->files[i].buffer; } } +m_aContext.makeCurrent(); gltf_renderer_release(m_pHandle); } } ___ 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/SdtHelper.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 053b17cb6fe7c0e138ac926d57daf415fbb2527e
Author: Jacobo Aragunde Pérez
Date: Fri Jul 11 11:14:39 2014 +0200
writerfilter: remove unlocalized help text
In general, it's not a good idea to add a help text for a widget on
the importer code. And in this case is consistent with MS Office
behavior: help text shown only when the field is empty.
Change-Id: I18b640549f558a190c0fdada825e80e6a730f69d
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx
b/writerfilter/source/dmapper/SdtHelper.cxx
index 14ad767..aeb129d 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -116,7 +116,6 @@ void SdtHelper::createDateControl(OUString& rContentText,
beans::PropertyValue a
{
utl::extractDate(aDateTime, aDate);
xPropertySet->setPropertyValue("Date", uno::makeAny(aDate));
-xPropertySet->setPropertyValue("HelpText",
uno::makeAny(OUString("Click here to enter a date")));
}
else
xPropertySet->setPropertyValue("HelpText", uno::makeAny(rContentText));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/inc
svx/inc/fmhelp.hrc |2 -- 1 file changed, 2 deletions(-) New commits: commit b011324e4aab2a5448ad45cd04dd4b2e4f863048 Author: Caolán McNamara Date: Fri Jul 11 09:46:57 2014 +0100 drop unused helpids Change-Id: Ie684da5922d9f645495a1965b9462d0ae2de2342 diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index e09fe03..2334002 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -44,13 +44,11 @@ #define HID_MN_XFORMS_INSTANCES_EDIT "SVX_HID_MN_XFORMS_INSTANCES_EDIT" #define HID_MN_XFORMS_INSTANCES_REMOVE "SVX_HID_MN_XFORMS_INSTANCES_REMOVE" #define HID_MN_XFORMS_SHOW_DETAILS "SVX_HID_MN_XFORMS_SHOW_DETAILS" -#define HID_XFORMS_TOOLBOX "SVX_HID_XFORMS_TOOLBOX" #define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD" #define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" #define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" #define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT" #define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE" -#define HID_XFORMS_ITEMS_LIST "SVX_HID_XFORMS_ITEMS_LIST" #define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST" #define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN" #define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN" ___ 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 |3 --- source/text/shared/01/xformsdata.xhp | 11 +++ 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 9f3d8e13a9180997db0bc525030fbc5e8ba59f21 Author: Caolán McNamara Date: Fri Jul 11 09:45:46 2014 +0100 update help ids for RID_SVX_XFORMS_TABPAGES .ui conversion Change-Id: Ided41f1c9c3deecabdb092315c7fe3e586b7d899 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index a3513a3..06738f4 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3121,11 +3121,9 @@ HID_WARNING_SECURITY_HYPERLINK,33374, HID_WIZARD_NEXT,33022, HID_WIZARD_PREVIOUS,33023, HID_XFORMS_INSTANCES_MENUBTN,38132, -HID_XFORMS_ITEMS_LIST,38129, HID_XFORMS_MODELS_LIST,38130, HID_XFORMS_MODELS_MENUBTN,38131, HID_XFORMS_TAB_CONTROL,38137, -HID_XFORMS_TOOLBOX,38123, HID_XFORMS_TOOLBOX_ITEM_ADD,38124, HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE,38126, HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT,38125, @@ -5663,7 +5661,6 @@ svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION,1237598721, svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680, svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880, svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320, -svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592, svx_TriStateBox_RID_SVXPAGE_LINE_TSB_CENTER_END,701548037, svx_TriStateBox_RID_SVXPAGE_LINE_TSB_CENTER_START,701548036, svx_TriStateBox_RID_SVXPAGE_SHADOW_TSB_SHOW_SHADOW,701711874, diff --git a/source/text/shared/01/xformsdata.xhp b/source/text/shared/01/xformsdata.xhp index 95d392d..788f4c6 100644 --- a/source/text/shared/01/xformsdata.xhp +++ b/source/text/shared/01/xformsdata.xhp @@ -34,8 +34,7 @@ Data Navigator;display options MW made "Data Navigator.." a two level entry - - + Data Navigator @@ -64,10 +63,9 @@ Show Details Switches the display to show or hide details.UFI: not explained in spec - + Instance Lists the items that belong to the current instance. - Submissions Lists the submissions.UFI. it's not in the spec Bindings @@ -87,14 +85,19 @@ Show data types Switches the display to show more or less details.UFI: not explained in spec + + + Add Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item. + Edit Opens a dialog to edit the selected item (element, attribute, submission, or binding). + Delete Deletes the selected item (element, attribute, submission, or binding). ___ 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 e8a23e1f7451a42c65503a0d23e5d65cd1611e53 Author: Caolán McNamara Date: Fri Jul 11 09:45:46 2014 +0100 Updated core Project: help 9f3d8e13a9180997db0bc525030fbc5e8ba59f21 diff --git a/helpcontent2 b/helpcontent2 index 957d5ee..9f3d8e1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 957d5ee976dc602e7c433e2659d748f453f086ac +Subproject commit 9f3d8e13a9180997db0bc525030fbc5e8ba59f21 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - cui/source
cui/source/options/optaboutconfig.cxx | 26 --
cui/source/options/optaboutconfig.hxx | 12
2 files changed, 16 insertions(+), 22 deletions(-)
New commits:
commit 458e7220b08886b4072b1093e9ebdbfef3fe9ee7
Author: Caolán McNamara
Date: Wed Jul 9 13:46:00 2014 +0100
Resolves: fdo#73806 reduce the size-request of the expert config dialog
the optimal size was set to be 1024x800, reduce this down to
effectively the same size as the options dialog itself.
This dialog just isn't ever going to be right given the huge
length of the strings and the number of strings. We need
something more like a file picker dialog view here
Change-Id: I019e951601c3df769a609b8b439b535b6d5e254f
(cherry picked from commit 877aa0e1e879b057027029c1ceed07f90b00b0d3)
Reviewed-on: https://gerrit.libreoffice.org/10182
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index ff39661..8bc67e8 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -124,21 +124,16 @@ Size CuiCustomMultilineEdit::GetOptimalSize() const
return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
}
-Size CuiAboutConfigTabPage::GetOptimalSize() const
-{
-return LogicToPixel(Size(1024,800),MAP_APPFONT);
-}
-
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const
SfxItemSet& rItemSet*/ ) :
ModalDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"),
m_pPrefCtrl( get("preferences") ),
m_pResetBtn( get("reset") ),
m_pEditBtn( get("edit") ),
m_vectorOfModified(),
-m_pPrefBox( new OptHeaderTabListBox( *m_pPrefCtrl,
- WB_SCROLL | WB_HSCROLL | WB_VSCROLL )
)
+m_pPrefBox( new SvSimpleTable(*m_pPrefCtrl,
+ WB_SCROLL | WB_HSCROLL | WB_VSCROLL ) )
{
-Size aControlSize(200,200);
+Size aControlSize(LogicToPixel(Size(385, 230), MAP_APPFONT));
m_pPrefCtrl->set_width_request(aControlSize.Width());
m_pPrefCtrl->set_height_request(aControlSize.Height());
@@ -152,11 +147,14 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window*
pParent/*, const SfxItemSe
rBar.InsertItem( ITEMID_TYPE, get("type")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
rBar.InsertItem( ITEMID_VALUE, get("value")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-long aTabs[] = {4,900,50,50,50};//TODO: Not works correctly hardcoded for
now.
+long aTabs[] = {4,0,0,0,0};
+
+float fWidth = approximate_char_width();
-aTabs[2] += aTabs[1] + rBar.GetTextWidth(rBar.GetItemText(1));
-aTabs[3] += aTabs[2] + 160; //rBar.GetTextWidth(rBar.GetItemText(2));
-aTabs[4] += aTabs[3] + 40; //rBar.GetTextWidth(rBar.GetItemText(3));
+aTabs[1] = 0;
+aTabs[2] = aTabs[1] + fWidth * 65;
+aTabs[3] = aTabs[2] + fWidth * 20;
+aTabs[4] = aTabs[3] + fWidth * 8;
m_pPrefBox->SetTabs(aTabs, MAP_PIXEL);
}
@@ -174,7 +172,7 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString&
rProp, const OUString& r
m_pPrefBox->Insert( pEntry );
}
-void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ )
+void CuiAboutConfigTabPage::Reset()
{
m_pPrefBox->Clear();
@@ -187,7 +185,7 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ )
m_pPrefBox->SetUpdateMode(true);
}
-bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ )
+bool CuiAboutConfigTabPage::FillItemSet()
{
bool bModified = false;
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 6761e3c..72ce9d9 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -37,7 +37,6 @@ public:
virtual void KeyInput( const KeyEvent& rKeyEvent ) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
-//void setBehaviour( bool bNumeric, int nLengthLimit);
};
class CuiAboutConfigTabPage : public ModalDialog
@@ -48,7 +47,7 @@ private:
PushButton* m_pEditBtn;
std::vector< boost::shared_ptr< Prop_Impl > > m_vectorOfModified;
-boost::scoped_ptr< svx::OptHeaderTabListBox > m_pPrefBox;
+boost::scoped_ptr< SvSimpleTable > m_pPrefBox;
void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp );
std::vector< OUString > commaStringToSequence( const OUString&
rCommaSepString );
@@ -57,15 +56,12 @@ private:
DECL_LINK( ResetBtnHdl_Impl, void * );
public:
- //static ModalDialog* Create( Window* pParent, const SfxItemSet& rItemset );
- CuiAboutConfigTabPage( Window* pParent/*, const SfxItemSet& rItemSet*/ );
+ CuiAboutConfigTabPage(Window* pParent);
void InsertEntry(const OUString& rProp, const OUString& rStatus, const
OUString& rType, const OUString& rValue);
- void Reset(/* const SfxItemSet&*/ );
+ void Reset();
void FillIt
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/appl/impldde.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 3d1cb5397d95bba5426ac5372bbd7644aac88409
Author: Herbert Dürr
Date: Wed Jul 9 15:23:59 2014 +
Related: #i125226# don't try to access known-bad DDE servers
(cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4
(cherry picked from commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2)
Related: #i125226# some macro preferences are directly...
applicable to DDE servers
(cherry picked from commit 2c835e761e1e9ddb6794895e6f3538b918160dd1)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: Ic16b3df34ac1b003a8a5cabab15ea655d05bdd18
Related: #i125226# typo fix
(cherry picked from commit 727ea069c6342e01a50c8b068ec302574b251cbd)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I8db53b7e8529d05e660a2d69e669b44c9045712c
(cherry picked from commit 13b68e24db26374ca17572de9abb429edeac32e9)
Related: #i125226# disallow absolute and relative paths for DDE servers
(cherry picked from commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I127add375a127dbbd0eaf12a10884e2636f1a332
(cherry picked from commit d1fc47793c1efbe9ff5271656283211647dd0b33)
Reviewed-on: https://gerrit.libreoffice.org/10202
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index cc6431d..b0b79a21 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -25,6 +25,7 @@
#include "impldde.hxx"
+#include
#include
#include
#include
@@ -45,6 +46,8 @@
#include
#include
+#include
+
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
@@ -243,15 +246,23 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
}
#if defined(WNT)
-
-// Server not up, try once more to start it.
-if( !bInWinExec )
+// check the suitability of starting the DDE server
+const SvtSecurityOptions aSecOpts;
+bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
+bForbidden |= (comphelper::string::indexOfAny(sServer, L":./%\\") !=
-1);
+static const char* aBadServers[] = { "cmd", "rundll32" };
+for (size_t i = 0; i < sizeof(aBadServers)/sizeof(*aBadServers); ++i)
+bForbidden |= sServer.equalsAscii(aBadServers[i]);
+
+// try to start the DDE server if it is not there already
+bForbidden |= (bInWinExec != false);
+if( !bForbidden )
{
OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
aCmdLine.append(".exe ");
aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 )
+if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 ) // TODO:
use CreateProcess() instead
nError = DDELINK_ERROR_APP;
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source
sfx2/source/appl/impldde.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
New commits:
commit ff91dd51e2d1db1039e54617d99a11fe27ccd1c9
Author: Herbert Dürr
Date: Wed Jul 9 15:23:59 2014 +
Related: #i125226# don't try to access known-bad DDE servers
(cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4
(cherry picked from commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2)
Related: #i125226# some macro preferences are directly...
applicable to DDE servers
(cherry picked from commit 2c835e761e1e9ddb6794895e6f3538b918160dd1)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: Ic16b3df34ac1b003a8a5cabab15ea655d05bdd18
Related: #i125226# typo fix
(cherry picked from commit 727ea069c6342e01a50c8b068ec302574b251cbd)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I8db53b7e8529d05e660a2d69e669b44c9045712c
(cherry picked from commit 13b68e24db26374ca17572de9abb429edeac32e9)
Related: #i125226# disallow absolute and relative paths for DDE servers
(cherry picked from commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I127add375a127dbbd0eaf12a10884e2636f1a332
(cherry picked from commit d1fc47793c1efbe9ff5271656283211647dd0b33)
Reviewed-on: https://gerrit.libreoffice.org/10200
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 501346a..7ec637a 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -25,6 +25,7 @@
#include "impldde.hxx"
+#include
#include
#include
#include
@@ -45,6 +46,8 @@
#include
#include
+#include
+
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
@@ -243,15 +246,23 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
}
#if defined(WNT)
-
-// Server not up, try once more to start it.
-if( !bInWinExec )
+// check the suitability of starting the DDE server
+const SvtSecurityOptions aSecOpts;
+bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
+bForbidden |= (comphelper::string::indexOfAny(sServer, L":./%\\") !=
-1);
+static const char* aBadServers[] = { "cmd", "rundll32" };
+for (size_t i = 0; i < sizeof(aBadServers)/sizeof(*aBadServers); ++i)
+bForbidden |= sServer.equalsAscii(aBadServers[i]);
+
+// try to start the DDE server if it is not there already
+bForbidden |= (bInWinExec != false);
+if( !bForbidden )
{
OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
aCmdLine.append(".exe ");
aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 )
+if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 ) // TODO:
use CreateProcess() instead
nError = DDELINK_ERROR_APP;
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1ed906b4cf0ab46a975f3caab8dfd1b5c7f4118 Author: Michael Meeks Date: Wed Jul 9 13:46:44 2014 +0100 fdo#75937 - package galaxy theme in a form we like; cf. fdo#81103. Change-Id: If920257f141a2dc4208d1fd322b875fdc8315cee Reviewed-on: https://gerrit.libreoffice.org/10172 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara Reviewed-by: Matúš Kukan Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/configure.ac b/configure.ac index 1de8036..047bf0f 100644 --- a/configure.ac +++ b/configure.ac @@ -11563,7 +11563,7 @@ dnl === AC_MSG_CHECKING([which themes to include]) # if none given use default subset of available themes if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then -with_theme="crystal default hicontrast oxygen tango sifr" +with_theme="crystal default galaxy hicontrast oxygen tango sifr" test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing" fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
