[Libreoffice-commits] core.git: 2 commits - configure.ac dbaccess/source
configure.ac |8 ++--
dbaccess/source/core/dataaccess/commanddefinition.cxx |7 +++
dbaccess/source/core/dataaccess/databasedocument.cxx |7 ++-
dbaccess/source/core/dataaccess/datasource.cxx|7 ++-
dbaccess/source/core/inc/services.hxx | 16 ++--
dbaccess/source/filter/xml/dbloader2.cxx |5 +
dbaccess/source/ui/browser/unodatbr.cxx | 12 ++--
7 files changed, 38 insertions(+), 24 deletions(-)
New commits:
commit 77be5e9064134fa0b559537433d57b6c0c646fa5
Author: Tor Lillqvist
Date: Wed Apr 16 09:56:08 2014 +0300
Update experimental hacks for using Clang from the NDK
Change-Id: Id8fd8ca3c53fe97caa00a2d1c80b73387a4be2bc
diff --git a/configure.ac b/configure.ac
index cbc7199..05a2931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,9 @@ AC_ARG_WITH(android-ndk-toolchain-version,
AS_HELP_STRING([--with-android-ndk-toolchain-version],
[Specify which toolchain version to use, of those present in the
Android NDK you are using. Mandatory if the NDK used has several
-toolchain versions for the host architecture you are building for.]),
,)
+toolchain versions for the host architecture you are building for.
+Possible values are 4.6, 4.8, clang3.3 and clang3.4. Only 4.8 has been
+tested for real...]), ,)
AC_ARG_WITH(android-sdk,
AS_HELP_STRING([--with-android-sdk],
@@ -268,12 +270,14 @@ if test -n "$with_android_ndk"; then
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
;;
-clang3.1|clang3.2)
+clang3.3|clang3.4)
AC_MSG_WARN([Building with the Clang tool-chain is known to break in
the bridges module, fix that please])
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
ANDROID_USING_CLANG=true
;;
+*)
+AC_MSG_ERROR([Unrecognized value for the
--with-android-ndk-toolchain-version option])
esac
if test ! -d $ANDROID_BINUTILS_DIR; then
commit e616c346d433dffd52fd483d8cfb3c4e5ec4169e
Author: Tor Lillqvist
Date: Wed Apr 16 09:51:47 2014 +0300
WaE: Unreferenced function definition [loplugin:unreffun]
Work around a slight confusion in the Clang plugin when used with Clang
3.2. Put these 'extern "C"' function definitions consistenly outside
namespaces, as they are declared in the header.
Change-Id: Iccee41dfe0776f382e677b109009a95fb806a12c
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx
b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 8efc222..14a527e 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -38,15 +38,14 @@ using namespace ::osl;
using namespace ::comphelper;
using namespace ::cppu;
-namespace dbaccess
-{
-
// OCommandDefinition
extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition()
{
-static ::dba::OAutoRegistration< OCommandDefinition > aAutoRegistration;
+static ::dba::OAutoRegistration< ::dbaccess::OCommandDefinition >
aAutoRegistration;
}
+namespace dbaccess
+{
void OCommandDefinition::registerProperties()
{
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 9270176..6a181bb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -146,13 +146,18 @@ bool ViewMonitor::onSetCurrentController( const
Reference< XController >& _rxCon
return bLoadFinished;
}
+} // namespace dbaccess
+
// ODatabaseDocument
extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument()
{
-static ::dba::OAutoRegistration< ODatabaseDocument > aAutoRegistration;
+static ::dba::OAutoRegistration< ::dbaccess::ODatabaseDocument >
aAutoRegistration;
}
+namespace dbaccess
+{
+
ODatabaseDocument::ODatabaseDocument(const
::rtl::Reference& _pImpl )
:ModelDependentComponent( _pImpl )
,ODatabaseDocument_OfficeDocument( getMutex() )
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index 3d65363..c1b5ba5 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -475,13 +475,18 @@ namespace
};
}
+} // namespace dbaccess
+
// ODatabaseContext
extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource()
{
-static ::dba::OAutoRegistration< ODatabaseSource > aAutoRegistration;
+static ::dba::OAutoRegistration< ::dbaccess::ODatabaseSource >
aAutoRegistration;
}
LibreOffice Gerrit News for core on 2014-04-16
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak about module filter + fdo#77476:FILE_SAVE : 'TIF' is changed to 'TIFF' in RT in https://gerrit.libreoffice.org/9010 from Ravindra Vidhate about module oox, sw + fdo77216-Charts-Scattered chart: Chart gets distorted on RT in https://gerrit.libreoffice.org/9011 from Sourav Mahajan about module chart2, oox + ftnfrm: Translated comments from German to English in https://gerrit.libreoffice.org/8948 from Tobias Mueller about module sw End of freshness + fdo#77451 Detect AOO 4.x for SvXMLImport::needFixPositionAfterZ in https://gerrit.libreoffice.org/9012 from Laurent BP about module xmloff + Fix a memory leak in https://gerrit.libreoffice.org/9016 from Takeshi Abe about module framework + fdo#76934 : FILESAVE: DOCX: Title is not preserved after Roundtrip in https://gerrit.libreoffice.org/8847 from Pallavi Jadhav about module sw, writerfilter * Merged changes on master for project core changed in the last 25 hours: + Rename ImplGetGradientColorValue in https://gerrit.libreoffice.org/8994 from Chris Sherlock + Change acessibility level for private functions in https://gerrit.libreoffice.org/8993 from Chris Sherlock + Reorganize locations of functions in gradient.cxx in https://gerrit.libreoffice.org/8992 from Chris Sherlock + Move hatch functions to own source file. in https://gerrit.libreoffice.org/8991 from Chris Sherlock + Fix typo in https://gerrit.libreoffice.org/8990 from Chris Sherlock + Move OutputDevice polygon funcs to vcl/source/gdi/outdev/polygon.cxx in https://gerrit.libreoffice.org/8989 from Chris Sherlock + Move OutputDevice gradient funcs to vcl/source/gdi/outdev/gradient.cxx in https://gerrit.libreoffice.org/8988 from Chris Sherlock + Rearrange position of gradient functions in outdev4.cxx in https://gerrit.libreoffice.org/8987 from Chris Sherlock + Move OutputDevice source files to vcl/source/gdi/outdev in https://gerrit.libreoffice.org/8986 from Chris Sherlock + Split outdev5.cxx and outdev6.cxx in https://gerrit.libreoffice.org/9004 from Chris Sherlock + Split outdev3.cxx in https://gerrit.libreoffice.org/9003 from Chris Sherlock + Split outdev2.cxx in https://gerrit.libreoffice.org/9002 from Chris Sherlock + Move lines and rectangles to seperate source files in https://gerrit.libreoffice.org/9001 from Chris Sherlock + Move line functions into line.cxx and polyline.cxx in https://gerrit.libreoffice.org/9000 from Chris Sherlock + Remove unnecessary headers from polygon.cxx in https://gerrit.libreoffice.org/8999 from Chris Sherlock + Remove unnecessary includes from hatch.cxx in https://gerrit.libreoffice.org/8998 from Chris Sherlock + Remove unnecessary includes from gradient.cxx in https://gerrit.libreoffice.org/8997 from Chris Sherlock + Move bezier functions into own source file bezier.cxx in https://gerrit.libreoffice.org/8996 from Chris Sherlock + Don't forget to add polygon as an object in the makefile! in https://gerrit.libreoffice.org/8995 from Chris Sherlock + Line spacing is not preserved for styles. in https://gerrit.libreoffice.org/8902 from Priyanka Gaikwad * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#43157 : Remove OSL_THIS_FILE in https://gerrit.libreoffice.org/8886 from Michaël Lefèvre + fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreo
Re: 'test-bugzilla-files.py' dependencies
Hey, On Wed, Apr 16, 2014 at 6:50 AM, John Smith wrote: > Hi, > > > When I attempt to run > 'dev-tools/test-bugzilla-filestest-bugzilla-files.py', it seems to > have some dependencies that i cant find anywhere in the repository's. > > In particular, the script attempts to load these jar files : > > /home/buildslave/source/bin/odfvalidator.jar > /home/buildslave/source/bin/officeotron.jar > > Is there a repository i can check out to get a copy of those files ? > Are there any other dependencies for 'test-bugzilla-files.py' ? > > https://code.google.com/p/officeotron/ http://incubator.apache.org/odftoolkit/conformance/ODFValidator.html Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/line.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit f9344940db627b549a9047da6b1bcc62a2d3a6ef Author: Tor Lillqvist Date: Wed Apr 16 07:38:10 2014 +0300 Need for std::accumulate() Change-Id: Ifdc9f936346d35b825d977fcd6e42953b46f30fe diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx index 08a813b..14b630c 100644 --- a/vcl/source/outdev/line.cxx +++ b/vcl/source/outdev/line.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
'test-bugzilla-files.py' dependencies
Hi, When I attempt to run 'dev-tools/test-bugzilla-filestest-bugzilla-files.py', it seems to have some dependencies that i cant find anywhere in the repository's. In particular, the script attempts to load these jar files : /home/buildslave/source/bin/odfvalidator.jar /home/buildslave/source/bin/officeotron.jar Is there a repository i can check out to get a copy of those files ? Are there any other dependencies for 'test-bugzilla-files.py' ? Thanks, Regards, John Smith. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
HarfBuzz performance problem
Hi there, This bug https://bugs.freedesktop.org/show_bug.cgi?id=75665 reveals that our HarfBuzz based text rendering is quite expensive. I tried to do what I could on the Calc side to lessen the impact of this problem. I've made some improvement, but I've hit my roadblock. I was wondering if anyone who is more familiar with HarfBuzz could suggest any good idea on how to improve this further. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/output.hxx |2 ++
sc/source/ui/view/output2.cxx | 34 +-
2 files changed, 31 insertions(+), 5 deletions(-)
New commits:
commit 087a79db1272858f107656c5ca3c6efb45680986
Author: Kohei Yoshida
Date: Tue Apr 15 20:47:37 2014 -0400
fdo#75665: Truncate string when clipped on screen.
This improves performance of text layouting by HarfBuzz for very long
strings.
HarfBuzz's layout algorithm appears to be more expensive than ICU's.
Change-Id: Ic9738b7b8f0f1a29c51c83b147763118939b90ef
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 0aee29f..6e542e4 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -66,6 +66,8 @@ private:
Rectangle maAlignRect;
Rectangle maClipRect;
longmnColWidth;
+longmnLeftClipLength; /// length of the string getting cut off
on the left.
+longmnRightClipLength; /// length of the string getting cut
off on the right.
boolmbLeftClip;
boolmbRightClip;
};
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 321cf04..90d562e 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1238,7 +1238,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY,
long nPosX, long nPosY
--nMergeSizeX; // leave out the grid horizontally, also for alignment
(align between grid lines)
rParam.mnColWidth = nMergeSizeX; // store the actual column width.
-
+rParam.mnLeftClipLength = rParam.mnRightClipLength = 0;
// construct the rectangles using logical left/right values (justify is
called at the end)
@@ -1331,6 +1331,8 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY,
long nPosX, long nPosY
rParam.mbLeftClip = ( nLeftMissing > 0 );
rParam.mbRightClip = ( nRightMissing > 0 );
+rParam.mnLeftClipLength = nLeftMissing;
+rParam.mnRightClipLength = nRightMissing;
}
else
{
@@ -2024,13 +2026,35 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
OUString aString = aVars.GetString();
if (!aString.isEmpty())
{
+// If the string is clipped, make it shorter for
+// better performance since drawing by HarfBuzz is
+// quite expensive especiall for long string.
+
+OUString aShort = aString;
+
+double fVisibleRatio = 1.0;
+double fTextWidth = aVars.GetTextSize().Width();
+if (eOutHorJust == SVX_HOR_JUSTIFY_LEFT &&
aAreaParam.mnRightClipLength > 0)
+fVisibleRatio = (fTextWidth -
aAreaParam.mnRightClipLength) / fTextWidth;
+else if (eOutHorJust == SVX_HOR_JUSTIFY_RIGHT &&
aAreaParam.mnLeftClipLength > 0)
+fVisibleRatio = (fTextWidth -
aAreaParam.mnLeftClipLength) / fTextWidth;
+
+if (fVisibleRatio < 1.0)
+{
+// Heuristically determine the length of the
+// visible section of the string. Length + 1
+// to avoid becoming too short.
+sal_Int32 nShortLen = fVisibleRatio *
aString.getLength() + 1;
+aShort = aShort.copy(0, nShortLen);
+}
+
if (bMetaFile || pFmtDevice != mpDev || aZoomX !=
aZoomY)
{
-size_t nLen = aString.getLength();
+size_t nLen = aShort.getLength();
if (aDX.size() < nLen)
aDX.resize(nLen, 0);
-pFmtDevice->GetTextArray(aString, &aDX[0]);
+pFmtDevice->GetTextArray(aShort, &aDX[0]);
if ( !mpRefDevice->GetConnectMetaFile() ||
mpRefDevice->GetOutDevType() ==
OUTDEV_PRINTER )
@@ -2040,10 +2064,10 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
aDX[i] = static_cast(aDX[i]
/ fMul + 0.5);
}
-mpDev->DrawTextArray(aDrawTextPos, aString,
&aDX[0]);
+mpDev->DrawTextArray(aDrawTextPos, aShort,
&aDX[0]);
}
else
-mpDev->DrawText( aDrawTextPos, aString );
+mpDev->DrawText(aDrawTextPos, aShort);
}
[Libreoffice-commits] core.git: Changes to 'private/moggi/screen-rendering'
New branch 'private/moggi/screen-rendering' available with the following commits: commit 0f92705d47f91a9148030270b366f2a5c05c203f Author: Markus Mohrhard Date: Wed Apr 16 01:55:45 2014 +0200 first step to on screen rendering Change-Id: Id44c928d212de096bb0304b878031d9c4837e757 commit 588d537b4e2f638460ce4ba3c2fea2d6aa680799 Author: Markus Mohrhard Date: Wed Apr 16 01:17:36 2014 +0200 store the current state At least the offscreen rendering is working. I will destroy all my hard work now and need a state that I can turn back that is still working. Change-Id: Ia5b33cff44f7bf52320d2df3e00e4c40b6fdebaf commit ddae4194b2325b8c12fa59e1d75e6a9f8a4ac6bd Author: Markus Mohrhard Date: Wed Apr 16 00:55:51 2014 +0200 no need for that using statement Change-Id: Ide94e0e4909574b01e5d739be3e9f9dd7652ba86 commit eafb0938c790b61b244c1e6d5b961640a2edf250 Author: Markus Mohrhard Date: Tue Apr 15 21:13:28 2014 +0200 remove hand written BMP export Change-Id: Ib37408d7de1aafc654be1f8fe57882ec3765a0b3 commit a54c4a928e364846d3bdcedb57fb91d6c14a2c8c Author: Markus Mohrhard Date: Tue Apr 15 20:51:20 2014 +0200 it made even less sense to have the dependency to mdds here Change-Id: Ia6f4557a26a32ee028eee04fa5babeef8ec3099e commit 482d84230d29776ece7eabca84ed24844d816831 Author: Markus Mohrhard Date: Tue Apr 15 20:39:58 2014 +0200 remove some crap that should not have been pushed Change-Id: I92b9aa565fc04fb095cedc2a89df468b2f568ea1 commit 95a660d09e43e1567a6e93268adfc1de00ccdd01 Author: Markus Mohrhard Date: Tue Apr 15 02:07:42 2014 +0200 chartcore does not need mdds right now Change-Id: I778d8e05b2c010916fc69c9316895ddc2ca9c725 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OutputDevice code reorganization
On Tue, 2014-04-15 at 18:56 -0400, Kohei Yoshida wrote: > On Wed, 2014-04-16 at 00:22 +0200, Thorsten Behrens wrote: > > Kohei Yoshida wrote: > > > My only request is that the move be done in such a way that git knows > > > the files have been moved (in a single commit), rather than the old > > > files removed and new one added. > > > > > That is, for all intents and purposes, not going to work here, when > > methods are mixed and matched differently. > > Oh, I thought he was just relocating the methods. Maybe I > mis-understood what he's doing. FWIW, from my own experience, I've done a fair amount of large scale reorganization in the past, and even if "methods are mixed and matched differently", with careful commit strategy you can stil maintain lineage of commit history. So, I wouldn't dismiss it right from the start. Anyway, ultimately it's all up to Chris since (as Norbert said) he's the one making this all happen. Mine was nothing more than just a humble request. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OutputDevice code reorganization
On Wed, 2014-04-16 at 00:22 +0200, Thorsten Behrens wrote: > Kohei Yoshida wrote: > > My only request is that the move be done in such a way that git knows > > the files have been moved (in a single commit), rather than the old > > files removed and new one added. > > > That is, for all intents and purposes, not going to work here, when > methods are mixed and matched differently. Oh, I thought he was just relocating the methods. Maybe I mis-understood what he's doing. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Survey on FOSS developers' political participation
Hi LibreOffice Developers I would be very happy if you could find 10 minutes to fill out this survey: http://www.itu.dk/people/nigw/limesurvey/index.php/749426/lang/da/newtest/Y?749426X2X428=LibreOffice It is the main part of my master thesis which I am writing at the IT University of Copenhagen, so I would very much appreciate your help. I apologize if this mail does not follow the guidelines for use of this list, but I was advised by developers that this would be the best place to reach the developers of LibreOffice. Kind regards and thank you for all your work on this great software, Nikolai Gad ___ 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 77027, which changed state. Bug 77027 Summary: ODF import: line color / fill color of embedded objects (like Math Formula) lost when importing document written by LO 4.0/4.1/4.2 https://bugs.freedesktop.org/show_bug.cgi?id=77027 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 - sd/qa xmloff/source
sd/qa/unit/data/odp/fdo77027.odp |binary
sd/qa/unit/import-tests.cxx | 35 +++
xmloff/source/draw/ximpshap.cxx |2 +-
xmloff/source/meta/xmlmetai.cxx | 13 +++--
4 files changed, 43 insertions(+), 7 deletions(-)
New commits:
commit 74d7911abf77643544c58a0d3e5fb956add76c44
Author: Michael Stahl
Date: Wed Apr 16 00:26:33 2014 +0200
ODF import: detect "LibreOfficeDev" in meta:generator too
Change-Id: Icea3086975dab1afedf111364683e6a7de50ce41
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 2ab36f6..17122cb 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -266,17 +266,18 @@ void SvXMLMetaDocumentContext::setBuildId(OUString const&
i_rBuildId, const uno:
}
}
-if (i_rBuildId.startsWith("LibreOffice/"))
+OUString rest;
+if (i_rBuildId.startsWith("LibreOffice/", &rest) ||
+i_rBuildId.startsWith("LibreOfficeDev/", &rest))
{
OUStringBuffer sNumber;
-for (sal_Int32 i = sizeof("LibreOffice/") - 1;
-i < i_rBuildId.getLength(); ++i)
+for (sal_Int32 i = 0; i < rest.getLength(); ++i)
{
-if (isdigit(i_rBuildId[i]))
+if (isdigit(rest[i]))
{
-sNumber.append(i_rBuildId[i]);
+sNumber.append(rest[i]);
}
-else if ('.' != i_rBuildId[i])
+else if ('.' != rest[i])
{
break;
}
commit 25a2eab22798373b8197f1e594568207eb7c5039
Author: Michael Stahl
Date: Tue Apr 15 23:34:37 2014 +0200
fdo#77027: ODF import: fix wrong version in check for embedded objects
SvXMLImport::LO_4x does not mean 4.0+ any more.
(regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)
Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a
diff --git a/sd/qa/unit/data/odp/fdo77027.odp b/sd/qa/unit/data/odp/fdo77027.odp
new file mode 100644
index 000..4d834d4
Binary files /dev/null and b/sd/qa/unit/data/odp/fdo77027.odp differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 073169a..c0897d5 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -26,6 +26,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -63,6 +65,7 @@ public:
void testN821567();
void testFdo68594();
void testFdo72998();
+void testFdo77027();
void testStrictOOXML();
void testN862510_1();
void testN862510_2();
@@ -86,6 +89,7 @@ public:
CPPUNIT_TEST(testN821567);
CPPUNIT_TEST(testFdo68594);
CPPUNIT_TEST(testFdo72998);
+CPPUNIT_TEST(testFdo77027);
CPPUNIT_TEST(testStrictOOXML);
CPPUNIT_TEST(testN862510_1);
CPPUNIT_TEST(testN862510_2);
@@ -549,6 +553,37 @@ void SdFiltersTest::testFdo72998()
xDocShRef->DoClose();
}
+// FIXME copypasta
+std::ostream& operator<<(std::ostream& rStrm, const Color& rColor)
+{
+rStrm << "Color: R:" << rColor.GetRed() << " G:" << rColor.GetGreen() << "
B: << rColor.GetBlue()";
+return rStrm;
+}
+
+void SdFiltersTest::testFdo77027()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/odp/fdo77027.odp"));
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+const SdrPage *pPage = pDoc->GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+{
+SdrOle2Obj *const pObj = dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT(pObj);
+
+// check that the fill style/color was actually imported
+const XFillStyleItem& rStyleItem = dynamic_cast(
+pObj->GetMergedItem(XATTR_FILLSTYLE));
+CPPUNIT_ASSERT_EQUAL(XFILL_SOLID, rStyleItem.GetValue());
+const XFillColorItem& rColorItem = dynamic_cast(
+pObj->GetMergedItem(XATTR_FILLCOLOR));
+CPPUNIT_ASSERT_EQUAL(Color(0xff6600), rColorItem.GetColorValue());
+}
+
+xDocShRef->DoClose();
+}
+
void SdFiltersTest::testFdo64512()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo64512.odp"));
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index ce27251..a3fd8bb 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2772,7 +2772,7 @@ void SdXMLObjectShapeContext::StartElement( const
::com::sun::star::uno::Referen
void SdXMLObjectShapeContext::EndElement()
{
if (GetImport().isGeneratorVersionOlderThan(
-SvXMLImport::OOo_34x, SvXMLImport::LO_4x))
+SvXMLImport::OOo_34x, SvXMLImport::LO_41x)) // < LO 4.0
{
// #i118485#
// If it's an old file from us written before OOo3.4, we need to
correct
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.o
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/languagetag/languagetag.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit e51ca506076a566bdd587f35cc0a8c58a50cdc2c
Author: Eike Rathke
Date: Wed Apr 16 00:32:33 2014 +0200
CID#1202769 comfort coverity
Change-Id: I84214dde71883065f1ca3737180f0d739b49d8ee
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 6541c90..3ae1f43 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1976,10 +1976,16 @@ bool LanguageTagImpl::isIsoODF() const
{
const_cast(this)->synCanonicalize();
if (!LanguageTag::isIsoScript( getScript()))
-return ((meIsIsoODF = DECISION_NO) == DECISION_YES);
+{
+meIsIsoODF = DECISION_NO;
+return false;
+}
// The usual case is lll-CC so simply check that first.
if (isIsoLocale())
-return ((meIsIsoODF = DECISION_YES) == DECISION_YES);
+{
+meIsIsoODF = DECISION_YES;
+return true;
+}
// If this is not ISO locale for which script must not exist it can
// still be ISO locale plus ISO script lll-Ssss-CC, but not ll- ...
// ll-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OutputDevice code reorganization
Kohei Yoshida wrote: > My only request is that the move be done in such a way that git knows > the files have been moved (in a single commit), rather than the old > files removed and new one added. > That is, for all intents and purposes, not going to work here, when methods are mixed and matched differently. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: 3 commits - sd/source slideshow/source
Zolnai Tamás wrote: > --- a/slideshow/source/engine/shapes/appletshape.cxx > +++ b/slideshow/source/engine/shapes/appletshape.cxx > @@ -96,11 +96,11 @@ namespace slideshow > virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds > ) const SAL_OVERRIDE; > virtual void implViewChanged( const UnoViewSharedPtr& rView ) > SAL_OVERRIDE; > virtual void implViewsChanged() SAL_OVERRIDE; > -virtual bool implStartIntrinsicAnimation() SAL_OVERRIDE; > -virtual bool implEndIntrinsicAnimation() SAL_OVERRIDE; > -virtual bool implPauseIntrinsicAnimation() SAL_OVERRIDE; > -virtual bool implIsIntrinsicAnimationPlaying() const > SAL_OVERRIDE; > -virtual void implSetIntrinsicAnimationTime(double) SAL_OVERRIDE; > +virtual void play() SAL_OVERRIDE; > +virtual void stop() SAL_OVERRIDE; > +virtual void pause() SAL_OVERRIDE; > +virtual bool isPlaying() const SAL_OVERRIDE; > +virtual void setMediaTime(double) SAL_OVERRIDE; > There's some point in having all those methods go through the base class first - you have exactly one central place to check invariants, log stuff, stick breakpoints in etc. It is now also needlessly deviating from implViewsChanged() and others. C.f. NVI pattern. > commit 2a594eb22bfed62fdbcef51a56c2c180bea0283f > Author: Zolnai Tam??s > Date: Mon Apr 14 16:23:06 2014 +0200 > > Slideshow: Remove unneded ExternalMediaShape > > ExternalShapeBase is the base class of MediaShape and > AppletShape so it's nonsense that ExternalMediaShape > to be the base of ExternalShapeBase. > Actually this class does nothing, anyway. > Well - it *did* provide a minimal interface for "media shapes" to calling code. What client code now sees is ExternalShapeBase, that drags in a chunk of private member definitions, irrelevant e.g. to the code in AnimationCommandNode. Maybe naming it IExternalMediaShape would have made my intention clearer. ;) If this is about the extra vtable - there's SAL_NO_VTABLE. Zolnai Tamás wrote: > commit 50b60c5508b3ba5a0b8dc05eac511d7edaa5a343 > Author: Zolnai Tam??s > Date: Tue Apr 15 22:23:42 2014 +0200 > > Slideshow: these methods override public methods > > So make them public too. > That is true, but for leaf classes that are supposed to be used via polymorphic pointers to their base, it is still idiomatic to have overridden virtuals to be private. In this case, there's really no danger in anyone using this implementation class - it is defined and visible only in this one cxx file. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table6.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 99b06e60ca9ad69bdd4d790097ff53ce56cd3bd0
Author: Eike Rathke
Date: Wed Apr 16 00:01:50 2014 +0200
CID#736182 guard against a dubious call from SearchAndReplace()
Change-Id: I6ce1b577c377721b882c1f8ec757a61e600ae671
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 1644f42..a6101db 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -516,6 +516,11 @@ bool ScTable::SearchStyle(const SvxSearchItem&
rSearchItem, SCCOL& rCol, SCROW&
if (bRows) // zeilenweise
{
+if (!ValidCol(nCol))
+{
+SAL_WARN( "sc.core", "SearchStyle: bad column " << nCol);
+return false;
+}
nRow += nAdd;
do
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LIbreOffice 4.1.6 RC1 available
Dear Community, The Document Foundation is pleased to announce the first release candidate of LibreOffice 4.1.6. The upcoming 4.1.6 will be the sixth and final in a sequence of frequent bugfix releases for our feature-packed 4.1 line. Feel free to give it a try instead of 4.1.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.1.6 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.1.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
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/bezier.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a2212cefc1a4a380f2cb72fe620f046b947e1dab Author: Tor Lillqvist Date: Wed Apr 16 00:54:45 2014 +0300 WaE: Unreferenced function definition [loplugin:unreffun] Change-Id: Ia6946179a5567fdf1a980113d2efe77d4e87af50 diff --git a/vcl/source/outdev/bezier.cxx b/vcl/source/outdev/bezier.cxx index 2736c4d..f60eb57 100644 --- a/vcl/source/outdev/bezier.cxx +++ b/vcl/source/outdev/bezier.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include Polygon ImplSubdivideBezier( const Polygon& rPoly ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] website.git: Branch 'update' - check.php
check.php | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 9a2f0598f2b5fda571ebc899fe59795d4384d719
Author: Christian Lohmaier
Date: Tue Apr 15 23:52:40 2014 +0200
enable update to 4.2.3
diff --git a/check.php b/check.php
index a690aba..6805eff 100644
--- a/check.php
+++ b/check.php
@@ -252,6 +252,8 @@ $build_hash_to_version = array(
'e0a1805d063a472a7b281ae3977a26d42a48b20' => '4.1.5.1',
'a02f36998a4af5e2f9fbec2b7e9f70a8b0bc934' => '4.1.5.2',
'1c1366bba2ba2b554cd2ca4d87c06da81c05d24' => '4.1.5.3', # unscheduled,
Final
+# 4.1.6
+'a59ce81388f477fc89db57f0c27f222f31884eb' => '4.1.6.1',
##
# 4.2.0 versions
@@ -269,6 +271,11 @@ $build_hash_to_version = array(
'3be8cda0bddd8e430d8cda1ebfd581265cca5a0' => '4.2.2.1', # rc1, was made
final
# 4.2.3
'3d4fc3d9dbf8f4c0aeb61498a81f91c5b7922f1' => '4.2.3.1',
+'7c5c769e412afd32da4d946d2cb0c8b0674e95e' => '4.2.3.2',
+'6c3586f855673fa6a1576797f575b31ac6fa0ba' => '4.2.3.3',
+'882f8a0a489bc99a9e60c7905a60226254cb6ff' => '4.2.3.3', # hotfix1, Final
+# 4.2.4
+'d4c441391e20647b3d2e8dde4d20aa868e77e51' => '4.2.4.1',
);
# Descriptions of the target versions
@@ -288,11 +295,11 @@ $update_map = array(
'update_src' =>
'http://www.libreoffice.org/download/libreoffice-stable/?type=&lang=&version=4.1.5',
'substitute' => true ),
-'latest' => array('gitid' =>
'3be8cda0bddd8e430d8cda1ebfd581265cca5a0',
- 'id' => 'LibreOffice 4.2.2',
- 'version' => '4.2.2',
+'latest' => array('gitid' =>
'882f8a0a489bc99a9e60c7905a60226254cb6ff',
+ 'id' => 'LibreOffice 4.2.3',
+ 'version' => '4.2.3',
'update_type' => 'text/html',
- 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.2.2',
+ 'update_src' =>
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.2.3',
'substitute' => true ),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/tbsdy/outdev' - 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/qa sw/qa
sc/qa/extras/macros-test.cxx |6 ++
sc/qa/unit/subsequent_export-test.cxx |8
sc/qa/unit/subsequent_filters-test.cxx |7 +++
sw/qa/core/macros-test.cxx |8
sw/qa/extras/rtfimport/rtfimport.cxx |2 ++
5 files changed, 31 insertions(+)
New commits:
commit 1f742c520d0cca536d1e8f59a435b014577b7b4c
Author: Stephan Bergmann
Date: Tue Apr 15 23:29:14 2014 +0200
Properly #ifdef some per-platform test code
Change-Id: I286fb35e223f205ecc649aa388471ef1b0823d86
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index a353380..e682d6a 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -36,9 +36,11 @@ class ScMacrosTest : public UnoApiTest
public:
ScMacrosTest();
+#if !defined MACOSX
void testStarBasic();
void testVba();
void testMSP();
+#endif
CPPUNIT_TEST_SUITE(ScMacrosTest);
#if !defined(MACOSX)
//enable this test if you want to play with star basic macros in unit tests
@@ -54,6 +56,8 @@ private:
uno::Reference m_xCalcComponent;
};
+#if !defined MACOSX
+
// I suppose you could say this test doesn't really belong here, OTOH
// we need a full document to run the test ( it related originally to an
// imported Excel VBA macro ) It's convenient and fast to unit test
@@ -276,6 +280,8 @@ void ScMacrosTest::testVba()
}
}
+#endif
+
ScMacrosTest::ScMacrosTest()
: UnoApiTest("/sc/qa/extras/testdocuments")
{
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 2ed1eaa..228a161 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -59,10 +59,14 @@ public:
virtual void setUp() SAL_OVERRIDE;
virtual void tearDown() SAL_OVERRIDE;
+#if !defined MACOSX && !defined DRAGONFLY
ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const
OUString&, const OUString&, sal_uLong );
+#endif
void test();
+#if !defined MACOSX && !defined DRAGONFLY
void testPasswordExport();
+#endif
void testConditionalFormatExportODS();
void testConditionalFormatExportXLSX();
void testColorScaleExportODS();
@@ -132,6 +136,7 @@ private:
};
+#if !defined MACOSX && !defined DRAGONFLY
ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const
OUString &rFilter,
const OUString &rUserData, const OUString& rTypeName, sal_uLong
nFormatType)
{
@@ -168,6 +173,7 @@ ScDocShellRef
ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt
OUString aPass("test");
return load(aTempFile.GetURL(), rFilter, rUserData, rTypeName,
nFormatType, nFormat, SOFFICE_FILEFORMAT_CURRENT, &aPass);
}
+#endif
void ScExportTest::test()
{
@@ -190,6 +196,7 @@ void ScExportTest::test()
ASSERT_DOUBLES_EQUAL(aVal, 1.0);
}
+#if !defined MACOSX && !defined DRAGONFLY
void ScExportTest::testPasswordExport()
{
ScDocShell* pShell = new ScDocShell(
@@ -215,6 +222,7 @@ void ScExportTest::testPasswordExport()
xDocSh->DoClose();
}
+#endif
void ScExportTest::testConditionalFormatExportODS()
{
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 437b2ac..318cd68 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -136,9 +136,11 @@ public:
void testRowIndex1BasedXLSX();
//misc tests unrelated to the import filters
+#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT)
void testPasswordNew();
void testPasswordOld();
void testPasswordWrongSHA();
+#endif
//test shape import
void testControlImport();
@@ -247,7 +249,10 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
+#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT)
void testPassword_Impl(const OUString& rFileNameBase);
+#endif
+
uno::Reference m_xCalcComponent;
};
@@ -1486,6 +1491,7 @@ void ScFiltersTest::testRowIndex1BasedXLSX()
xDocSh->DoClose();
}
+#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT)
void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase)
{
OUString aFileExtension(getFileFormats()[0].pName,
strlen(getFileFormats()[0].pName), RTL_TEXTENCODING_UTF8 );
@@ -1541,6 +1547,7 @@ void ScFiltersTest::testPasswordWrongSHA()
const OUString aFileNameBase("passwordWrongSHA.");
testPassword_Impl(aFileNameBase);
}
+#endif
void ScFiltersTest::testControlImport()
{
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 9e9ed6f..d8ad141 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -51,13 +51,17 @@ class SwMacrosTest : public test::BootstrapFixture, public
unotest::MacrosTest
public:
SwMacrosTest();
+#if !defined MACOSX && !defined WNT
void createFileURL(const OUString& aFileBase, const OUString&
aFileExtension, OUString& rFilePath);
+#endif
virtual
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 78fcb7f256802232239b5acf8b11949a298c87e4
Author: Eike Rathke
Date: Tue Apr 15 23:04:52 2014 +0200
CID#1202961 init class member
Change-Id: I5b00cdf68220282e5d0ff99352e04552cdecce09
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index e2e5545..99c2d7d 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -184,6 +184,7 @@ void ImportExcel::Formula(
ExcelToSc::ExcelToSc( XclImpRoot& rRoot ) :
ExcelConverterBase(rRoot.GetDocImport().getDoc().GetSharedStringPool(),
512),
XclImpRoot( rRoot ),
+bExternName( false ),
maFuncProv( rRoot ),
meBiff( rRoot.GetBiff() )
{
___
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/dbgui/csvgrid.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 6994a32e2c2ce15d829d0ace367bf1eeed1603b8
Author: Eike Rathke
Date: Tue Apr 15 22:59:07 2014 +0200
CID#1202973 init class members
Change-Id: Ib14d24970faa35ad0caf8c8a8bf7f9cef5764b89
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 3a1b2cd..3bd16a9 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -70,7 +70,9 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) :
maColStates( 1 ),
maTypeNames( 1 ),
mnFirstImpLine( 0 ),
-mnRecentSelCol( CSV_COLUMN_INVALID )
+mnRecentSelCol( CSV_COLUMN_INVALID ),
+mnMTCurrCol( SAL_MAX_UINT32 ),
+mbMTSelecting( false )
{
mpEditEngine->SetRefDevice( &maBackgrDev );
mpEditEngine->SetRefMapMode( MapMode( MAP_PIXEL ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] Branch libreoffice-4-1-6 and Tag libreoffice-4.1.6.1 created
Hi all, The tag libreoffice-4.1.6.1 (AKA 4.1.6 RC1) and the corresponding branch libreoffice-4-1-6 have been created. The branch will be used for fine tuning of the 4.1.6 release. (there is one additional RC planned). LibreOffice 4.1.6 is the last planned release on the 4.1 codeline. The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-1 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.6_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-1-6 origin/libreoffice-4-1-6 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.1.6.1 libreoffice-4.1.6.1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-1-6 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.1.5 RC3 (4.1.5 final) Happy hacking, Christian + core + "Official" TDF Mac builds are done w/o ext-wiki-publisher [Stephan Bergmann] + accept proper number style condition != as not equal operator, (fdo#76777) [Eike Rathke] + add OnItemDblClicked and setOpenTemplateHdl in templateSearchView (fdo#65430) [Joren De Cuyper] + allow overwriting of string value with numeric one. (fdo#72691) [Kohei Yoshida] + always set input as text when that's requested. (fdo#72491) [Kohei Yoshida] + autorecovery: fix saving password in protected documents. (fdo#51819) [Matúš Kukan] + avoid putting these cells in formula tree prematurely. (fdo#69244) [Kohei Yoshida] + branch libreoffice-4-1-6 [Christian Lohmaier] + bump product version to 4.1.6.0.0+ [Christian Lohmaier] + bump product version to 4.1.6.1 [Christian Lohmaier] + cairo canvas: Zero font's width means "the same as height". [Jan Holesovsky] + changed priority in style preparation (i#123510, fdo#69271) [Armin Le Grand] + check if the *document* is closing, not the *app*. (fdo#73773) [Kohei Yoshida] + check if the resulting polygon... (i#124453) [Jürgen Schmidt] + default(Date|Time) is a UNO struct now (fdo#67235, fdo#69652) [Lionel Elie Mamane] + dereference before null check (coverity#705966, coverity#705969) [Caolán McNamara] + detect add to table beyond MAX_TABLE_SIZE [Caolán McNamara] + do not add multiple empty strings to the validation list (fdo#61520) [Eike Rathke] + do not reference a dangling OUString [Stephan Bergmann] + do not remove too much from the path (rhbz#1017379, fdo#33852) [David Tardon] + DOC import: don't overwrite WW8Num* character styles (bnc#821208) [Miklos Vajna] + DOC import: fix unwanted char background in numbering char style (bnc#821208) [Miklos Vajna] + DOCX import: fix context stack when importing header/footer (rhbz#988516) [Michael Stahl] + DOCX import: fix nested tables anchored inside tables (fdo#74357, bnc#779620) [Miklos Vajna] + DOCX import: table cell btLr text direction fixes (bnc#865381) [Miklos Vajna] + don't bother with synonyms for text with mixed script types. (fdo#46707) [Kohei Yoshida] + don't crash if we can't create an instance of a calc addin. (fdo#62155) [Michael Meeks] + don't drag around and use an uninitialized variable. (fdo#74519) [Michael Meeks] + don't unduly delay Bridge termination (fdo#56511) [Stephan Bergmann] + drawingml import: don't set CharEscapementHeight unconditionally (fdo#70220, fdo#72481) [Björgvin Ragnarsson] + edit->changes->show has empty filter settings [Caolán McNamara] + EMF+: Only draw endcap outline if not filled, fix endcap scaling. [Andrzej Hunt] + error msg in Web Page Wizard dialog (fdo#76802) [Julien Nabet] + explictly list common lang-independant template dir (fdo#76930) [Caolán McNamara] + fill the range edit boxes after the table is fully initialized. (fdo#71729) [Kohei Yoshida] + filter: make LibXSLTTransformer init backward compatible [Michael Stahl] + fix brace position (i#121420) [Stephan Bergmann] + fix crash in css rgb color handling. [Jan Holesovsky] + fix docked panels borders (fdo#59329) [Ahmad H. Al Harthi] + fix docked window border lines (fdo#59329) [Ahmad H. Al Harthi] + fix for Different_Odd_And_Even_Pages flag ignored (fdo#65655) [Adam Co] + fix for itemstate in parent style incorrectly report
[ANNOUNCE] Branch libreoffice-4-2-4 and Tag libreoffice-4.2.4.1 created
Hi all, The tag libreoffice-4.2.4.1 (AKA 4.2.4 RC1) and the corresponding branch libreoffice-4-2-4 have been created. The branch will be used for fine tuning of the 4.2.4 release. (there is one additional RC planned) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-2 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-2' branch is still active and will be used for the 4.2.5 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.4_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-2-4 origin/libreoffice-4-2-4 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.2.4.1 libreoffice-4.2.4.1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-2-4 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.2.3 RC3 (4.2.3 final) Happy hacking, Christian + core + -fno-weak is unknown in the Clang 3.4 in current Xcode (5.1) [Tor Lillqvist] + -Werror=shadow [Miklos Vajna] + accept proper number style condition != as not equal operator, (fdo#76777) [Eike Rathke] + adapt to OUString changes and set length exactly. (fdo#74302) [Matúš Kukan] + add check for image data offset... (i#124467) [Jürgen Schmidt] + add parameter to supress dialog [Mathias Supp] + adjust reference during undo of drag-n-drop of cell range. (fdo#71491) [Kohei Yoshida] + align exterior borders of a table correctly for double lines. (fdo#75260) [Kohei Yoshida] + apparently some table .docx properties shouldn't be < 0 [Luboš Luňák] + apply object-in front selection on mouseUp (fdo#69157) [Lennard Wasserthal] + apply the same fix from writer table to character bordering. (fdo#75260) [Kohei Yoshida] + apply the same fix from writer table to paragraph bordering. (fdo#75260) [Kohei Yoshida] + assure correct line break for multi-lined Input Fields (fdo#76235, i#124039) [Oliver-Rainer Wittmann] + asterisk at the beginning of Paragraph without "Nowiki" (fdo#75308, fdo#74875) [Julien Nabet] + avoid joining new formula cells individually. (fdo#76470) [Kohei Yoshida] + avoid only bad Graphite ligature replacement (fdo#70666) [László Németh] + avoid repeated table layouting (fdo#75622) [Luboš Luňák] + branch libreoffice-4-2-4 [Christian Lohmaier] + build liblangtag with updated IANA language-subtag-registry [Eike Rathke] + bullet sizes set wrong. (bnc#828390) [Muthu Subramanian] + bump product version to 4.2.4.1 [Christian Lohmaier] + bump version to 4.2.4.0.0+ [Christian Lohmaier] + calc link auto-update interval is changed on file save (fdo#76961) [Niklas Johansson] + check if the resulting polygon... (i#124453) [Jürgen Schmidt] + check that stacks are not empty before top() [Caolán McNamara] + clear sheet deleted flags for affected references when undoing. (fdo#75977) [Kohei Yoshida] + compare external formula tokens correctly. (fdo#77307) [Kohei Yoshida] + configure: disable LTO by default for MSVC too (fdo#75376) [Michael Stahl] + correct name of Outline Numbering dialog (fdo#75772) [Laurent Balland-Poirier] + crash on loading .docx (rhbz#1077780) [Caolán McNamara] + crash with "New style from selection" with List (coverity#1130423, fdo#77174) [Caolán McNamara] + cutting nothing should do nothing, should fix field dupes (fdo#74981) [Bjoern Michaelsen] + delete the destination first then paste. (rhbz#1080196) [Kohei Yoshida] + dereference before null check (coverity#705966, coverity#705969) [Caolán McNamara] + detect add to table beyond MAX_TABLE_SIZE [Caolán McNamara] + disable kernel pre-compilation for now. [Kohei Yoshida] + disabled CF_DIBV5... (i#124085) [Armin Le Grand] + discard invalid user data (fdo#75307) [Caolán McNamara] + do DiscoveryService socket setup off the main thread. (fdo#75328) [Andrzej Hunt] + DOC import: fix unwanted char background in numbering char style (bnc#821208) [Miklos Vajna] + DOC import: fProtEnabled means document is not totally read-only (cp#144) [Miklos Vajna] + DOCX import: table cell btLr text direction fixes (bnc#865381) [Miklos Vajna] + don't crash if we can't create an instance of a calc addin. (fdo#62155) [
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo77267.rtf | 12
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
3 files changed, 21 insertions(+)
New commits:
commit b84fed9967cb3364c5f9eb1064ab04336cf4e822
Author: Miklos Vajna
Date: Mon Apr 14 08:52:59 2014 +0200
fdo#77267 RTF import: pard should reset current paragraph style
Change-Id: I8d78ce262a4e57161325231a78e48750909b1bad
(cherry picked from commit 904630a2272ac4dd540939f8a462bff5d636f066)
Reviewed-on: https://gerrit.libreoffice.org/9055
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/rtfimport/data/fdo77267.rtf
b/sw/qa/extras/rtfimport/data/fdo77267.rtf
new file mode 100644
index 000..f9b9060
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo77267.rtf
@@ -0,0 +1,12 @@
+{\rtf1\ansi\ansicpg1250\uc1 \deff0\deflang1045\deflangfe1045
+{\stylesheet
+{
+\li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\fs24\lang1045\langfe1045\cgrid\langnp1045\langfenp1045 \snext0 Normal;}
+{\s4\qc \li0\ri0\sl360\slmult1
+\keepn\nowidctlpar\faauto\outlinelevel3\rin0\lin0\itap0
\b\fs52\lang1045\langfe1045\cgrid\langnp1045\langfenp1045 \sbasedon0 \snext0
heading 4;}
+}
+\pard\plain \s4\qc
\li0\ri0\sl360\slmult1\keepn\nowidctlpar\faauto\outlinelevel3\rin0\lin0\itap0
+\pard \qc
+l
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 5bcdcb4..4d61147 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1622,6 +1622,12 @@ DECLARE_RTFIMPORT_TEST(testFdo74599, "fdo74599.rtf")
CPPUNIT_ASSERT_EQUAL(static_cast(-1),
getProperty(xPropertySet, "CharColor"));
}
+DECLARE_RTFIMPORT_TEST(testFdo77267, "fdo77267.rtf")
+{
+// Paragraph was aligned to left, should be center.
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_cast(getProperty(getParagraph(1),
"ParaAdjust")));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4bf522f..b5a5f13 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2522,6 +2522,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PFInTable,
RTFValue::Pointer_t(new RTFValue(1)));
}
m_aStates.top().resetFrame();
+
+// Reset currently selected paragraph style as well.
+m_aStates.top().nCurrentStyleIndex = -1;
break;
case RTF_SECTD:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/appletshape.cxx | 11 ++- slideshow/source/engine/shapes/mediashape.cxx | 11 ++- 2 files changed, 12 insertions(+), 10 deletions(-) New commits: commit 50b60c5508b3ba5a0b8dc05eac511d7edaa5a343 Author: Zolnai Tamás Date: Tue Apr 15 22:23:42 2014 +0200 Slideshow: these methods override public methods So make them public too. Change-Id: I34baccd258ccd70185ee88efc8f09a8b868f6b67 diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 85ec41f..d9fc316 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -79,6 +79,12 @@ namespace slideshow sal_Size nNumPropEntries, const SlideShowContext&rContext ); // throw ShapeLoadFailedException; +virtual void play() SAL_OVERRIDE; +virtual void stop() SAL_OVERRIDE; +virtual void pause() SAL_OVERRIDE; +virtual bool isPlaying() const SAL_OVERRIDE; +virtual void setMediaTime(double) SAL_OVERRIDE; + private: // View layer methods @@ -96,11 +102,6 @@ namespace slideshow virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const SAL_OVERRIDE; virtual void implViewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; virtual void implViewsChanged() SAL_OVERRIDE; -virtual void play() SAL_OVERRIDE; -virtual void stop() SAL_OVERRIDE; -virtual void pause() SAL_OVERRIDE; -virtual bool isPlaying() const SAL_OVERRIDE; -virtual void setMediaTime(double) SAL_OVERRIDE; const OUString maServiceName; const char**mpPropCopyTable; diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index ae13af3..83f3df8 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -65,6 +65,12 @@ namespace slideshow double nPrio, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; +virtual void play() SAL_OVERRIDE; +virtual void stop() SAL_OVERRIDE; +virtual void pause() SAL_OVERRIDE; +virtual bool isPlaying() const SAL_OVERRIDE; +virtual void setMediaTime(double) SAL_OVERRIDE; + private: // View layer methods @@ -82,11 +88,6 @@ namespace slideshow virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const SAL_OVERRIDE; virtual void implViewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; virtual void implViewsChanged() SAL_OVERRIDE; -virtual void play() SAL_OVERRIDE; -virtual void stop() SAL_OVERRIDE; -virtual void pause() SAL_OVERRIDE; -virtual bool isPlaying() const SAL_OVERRIDE; -virtual void setMediaTime(double) SAL_OVERRIDE; /// the list of active view shapes (one for each registered view layer) typedef ::std::vector< ViewMediaShapeSharedPtr > ViewMediaShapeVector; ___ 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/view/prevwsh.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b4bcd9ee53680bfb2a32ef273ab806b21830c6ce
Author: Eike Rathke
Date: Tue Apr 15 22:18:08 2014 +0200
CID#1202954 init class member
Change-Id: If5ba55d752674b5bd81b406a28a78381177d6442
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 77dc60f..ddc0563 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -149,6 +149,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ),
mpFrameWindow(NULL),
nSourceDesignMode( SC_FORCEMODE_NONE ),
+nMaxVertPos(0),
pAccessibilityBroadcaster( NULL )
{
Construct( &pViewFrame->GetWindow() );
___
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 75376, which changed state. Bug 75376 Summary: Documents with fields have weird characters https://bugs.freedesktop.org/show_bug.cgi?id=75376 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 - canvas/source include/o3tl
canvas/source/vcl/impltools.cxx|7 --
include/o3tl/compat_functional.hxx | 43 -
2 files changed, 5 insertions(+), 45 deletions(-)
New commits:
commit 7e6628f374cdb87631b54ccdafd69554eda9536e
Author: Thorsten Behrens
Date: Tue Apr 15 21:36:02 2014 +0200
Unused code: binary_compose, identity
Seems noone is using those anymore.
Change-Id: I63f775d391c58753e89549dbcae8739708395487
diff --git a/include/o3tl/compat_functional.hxx
b/include/o3tl/compat_functional.hxx
index 0484060..6dff02b 100644
--- a/include/o3tl/compat_functional.hxx
+++ b/include/o3tl/compat_functional.hxx
@@ -37,16 +37,6 @@
namespace o3tl
{
-/// Identity functor - return the input value
-template
-struct identity : public std::unary_function
-{
- T operator()(const T& y) const
- {
- return (y);
- }
-};
-
/// Functor, given two parameters, return the first
template
struct project1st : public std::binary_function
@@ -111,31 +101,6 @@ inline unary_compose compose1(const F1& fnction1,
const F2& fnction2)
return (unary_compose(fnction1, fnction2));
}
-/// Calls F2 and F3 for the two args of F1, respectively
-template
-class binary_compose : public std::unary_function
-{
-public:
-binary_compose(const F1& fnction1, const F2& fnction2, const F3&
fnction3) : ftor1(fnction1), ftor2(fnction2), ftor3(fnction3) {}
-
-typename F1::result_type operator()(const typename F2::argument_type&
y) const
-{
-return (ftor1(ftor2(y), ftor3(y)));
-}
-
-protected:
-F1 ftor1;
-F2 ftor2;
-F3 ftor3;
-};
-
-/// Creates functor that calls F2 and F3 for the two args of F1, respectively
-template
-inline binary_compose compose2(const F1& fnction1, const F2&
fnction2, const F3& fnction3)
-{
-return (binary_compose(fnction1, fnction2, fnction3));
-}
-
} // namespace o3tl
#endif
commit 3764cfbc69815e5e74a689a5aeb07b0668ee861f
Author: Thorsten Behrens
Date: Tue Apr 15 21:31:00 2014 +0200
Remove iota template function & last call site.
Nice function, but with just one place using it in 9 years best
coded verbatim at the call site...
Change-Id: Ib306cf2311a39299cb007441c7cb1b0d81e67bce
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index d46ac32..4a5091d 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -48,7 +48,6 @@
#include
#include
-#include
#include "impltools.hxx"
#include "canvasbitmap.hxx"
@@ -281,7 +280,11 @@ namespace vclcanvas
{
// source already has alpha channel - 1:1 mapping,
// i.e. aAlphaMap[0]=0,...,aAlphaMap[255]=255.
-::o3tl::iota( aAlphaMap, &aAlphaMap[256], 0 );
+sal_uInt8 val=0;
+sal_uInt8* pCur=aAlphaMap;
+sal_uInt8* const pEnd=&aAlphaMap[256];
+while(pCur != pEnd)
+*pCur++ = val++;
}
else
{
diff --git a/include/o3tl/compat_functional.hxx
b/include/o3tl/compat_functional.hxx
index 00ae33c..0484060 100644
--- a/include/o3tl/compat_functional.hxx
+++ b/include/o3tl/compat_functional.hxx
@@ -136,14 +136,6 @@ inline binary_compose compose2(const F1&
fnction1, const F2& fnction
return (binary_compose(fnction1, fnction2, fnction3));
}
-/// Algo that assigns val, val+1, ... to the given range
-template
-inline void iota(FwdIter first, FwdIter last, ValueType val)
-{
-while(first != last)
-*first++ = val++;
-}
-
} // namespace o3tl
#endif
___
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' - filter/source
filter/source/pdf/impdialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a9e669b7948ab734bcbbd76a0919ba91cca2850e Author: Andras Timar Date: Tue Apr 15 16:39:07 2014 +0200 fdo#74654 fix typo: printnone -> printhigh Change-Id: I286dedfb6dfd8d9c119bf1b6ac777a2a08f22d7e Reviewed-on: https://gerrit.libreoffice.org/9015 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 54e40ab..631afd239 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1088,7 +1088,7 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet get(mpPrintPermissions, "printing"); get(mpRbPrintNone, "printnone"); get(mpRbPrintLowRes, "printlow"); -get(mpRbPrintHighRes, "printnone"); +get(mpRbPrintHighRes, "printhigh"); get(mpChangesAllowed, "changes"); get(mpRbChangesNone, "changenone"); ___ 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-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0c4a6c614a798ac9844a90b1a89ae2db16293f79 Author: Christian Lohmaier Date: Tue Apr 15 21:45:25 2014 +0200 bump version to 4.2.4.1.0+ Change-Id: If2cf76f12f5cbd7b60bb08ce91a5f78ff51cf713 diff --git a/configure.ac b/configure.ac index b352974..a34d066 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.4.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.4.1'
Tag 'libreoffice-4.2.4.1' created by Christian Lohmaier at 2014-04-15 20:44 +0200 Tag libreoffice-4.2.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTTYwaAAoJEPQ0oe+v7q6j5/4QAKA5tYJbEhMFZ2Q3nLTijsXC ZzvK2cUV0rS87Rh9CddSM1Z+jdnR15Yl2oVtTbDg0WjG1j/Uk3jzdgn76ss+Ms6J FRAIZ0c4HQ+n6ZxFEP79vW9I/IUOpOdmQXk464K6qQbZjjRWJEkm1pOQ7x2SxxTQ NPQ+BB/pC79Zl0OLnNYJjDS/3lqo+HlT9pTi4MfByS7UlOlO5jXveRY3j85PNG9K L6bl83GebDf8MYtR/E4BVv76Mskpn+Gtlz4RK9TrBS3D+r9PgsiOweWW6j1z9ZW3 hQJiO5Vnoi/nfGjodEGHcpreid7vBIKik+6RFq4p183dBV+IbbaluC53OEK2P5vV TwXab4bVwEWdPtlDPYR++GhetdCQgK125FU99DeRkut6i9P0CI13LaBNGtgpuW2V axfMfM790ZFdJkWZ1qTpDZabGCJFI5cH4k4fBoZwOh5YhE9JaymkCynq0oLrgF7D UfqahjSEqrchl3mOUAFDrH1mEjsDyQlZ8gGq39ALvOL79dvp9U7fVJAk/aaDMvtR aAKorkLXCYdzhDMGV/8uozwxYrlascL9PTk8u+NF0Ck33YO/eSomHyy+rwS/0JTF /O6sWvWjI+AvnPwhhXrgUD04OJkAEq2vw+g52St+igqLvipHPvWwaqNO6DiNF6rG LEh/8amjf4mopA2dLcfO =96pW -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.4.1'
Tag 'libreoffice-4.2.4.1' created by Christian Lohmaier at 2014-04-15 20:44 +0200 Tag libreoffice-4.2.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTTYwjAAoJEPQ0oe+v7q6jQzAP/1cdAKEg3SZNc2aJ1EgBS2kn /P/Yacd6rENcKWvSOP6/ikUIpYpbSTU+jKGCBJyr0jwu9pn17n0ItBd5n5kmNRYY BVrhqlkKqgw6YEZ4xDEuSF3XaIp/itXcedEb1F4wzC2c2cSCzfSJyBpi02HcpeGA 3qVyVzySSfQDiR+dkn5zviYndi3cKgUbtr3EOXtJr0nhlGAhYwOF8Z58u4BqPiyS M7TfNtbZmdrQchZtWRnvBZ6yYs+jWYWxzbtnGFj1d7NGdyUgdJ4kUidv6MxE8Gp4 KRAI/L/wmLkclr7gF9tSrcFk4Xa3RaGMkq8z7S1Asz+fK1mRaEoQnNozr/+q5zPr +JLqckmd8reFUoHVMO/5nkWa8EcjGBHeOVm16mrpvUf5ywE4ESopY8pBML2Ajkqe incFUFOQ4DLU/WSzQyPVegjyVo+6tZ38oERW0xhMkBEGKfHMBldQrRgZZDLfrk/s GUfa/fEcGisBCaYWn+pg7wdAQbKQzK+U+dIIBd10b2e84NC5xI9vS1KK0Yrkf+qZ FU3EgGq29BrVmVIe2QEdMW9Eja+jgXaGw2koOljb5U3+rcTaqPz0o7EknwK8xoZj 9//RIKNmzOJhBV1PzunGGyWud7u+heRfS0vR7qNVTwd9J34Qv9/0+yGdTGSaX4J9 GT720kjcyF/0WaiG/ka7 =i6Kq -END PGP SIGNATURE- Changes since cp-4.2-branch-point-214: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.4.1'
Tag 'libreoffice-4.2.4.1' created by Christian Lohmaier at 2014-04-15 20:44 +0200 Tag libreoffice-4.2.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTTYwVAAoJEPQ0oe+v7q6jBN4P/01guy5gOyjrK/yjp1AmaXS1 fYRv0MwcCKFwi/zZwix/7ftf+MGgBrlPIjhLq0pRGKebtUgBKwN/9m9wOC9Rca3U zOgchDSDbJEClpMu4R+XSa/XNtKHWVGymBteQreMiT1ISbe7dC4MTUahwrSVJ5s7 pYZDmW2kPzGQNzygv44KB84SONO32UzNfShsZxkqbMAS8V5BeTsvmMjciDZDnJ+b 6im9A/YMTdI1BEMkmQ2pVJxmHhrgZv/5032dBS7N8thIvV4htCqpPrhtoVz4a7mS bldKUE+s1iJMU+AnpCPocuJ/VCiQ8+N/LlUfHiFBBEmOzDQ4lf7QWAFwlhrXVIvq maOf6/ozZhOL5FhP+op9sAgYHQF9vPih4CegwM7B0+WIM0gfRP+abUJkLAbH1i6m ktdDxfZEFJitbXk/y1FQbWML96RBrOA6yGryEr0gSxkjUThHvG9FhNbIOB14hKtq 6GzRpFmFil3+deuzC78YUwrjMHlfCEcZyjVViWYvFXL9c7bgD1FOA4iGWn6rAc7e v504yRDVRiq/qlOnVzdVsQtXtfi79gp2cksBd2BfLTsbsW04TCNUnCEH2YPLC0uB KdyfQtoo/03lZnVKJLQM5CXOl43oiYDTYNRNo2I4x2dIs0EANztvRdd4Imp7IY+D vw4ya2i8BOjJAUvaPgSQ =b6jJ -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.4.1'
Tag 'libreoffice-4.2.4.1' created by Christian Lohmaier at 2014-04-15 20:44 +0200 Tag libreoffice-4.2.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTTYwfAAoJEPQ0oe+v7q6jEIkP/jwPk1z68ZeUanZL2582b0/H MsXd4yExFOr/HdTugZ3YQquxnMEcVZQFf6/ycDJ53kAY1OcbVZACpHrWwKqhbDiA bdVashzdT84dSfvtbLumaLwWUvaJrmGnC+nQsmH3kf0DEM50OnfZ38r9+Y69SPbL TF7k/6NLEgNsBTcnfdsdcg2ttdmX433Sd6ksJI9B/WZY1V0WVi89JaXB0dQj9mUu HWwMDot57Uuvmqfuzw8x41D87s8vhpMsYSCvPxX1FqYzAvYjsuqz7asMb5NLII0u YXc9XDGTLUjnDAajC/H2dSrj9WXAzf5p8AHHKpgZ5CeyGEjoE0OhFvqU0LR7jUtp 7K37YSMA2kfa8HhYVdV9q2DBJI0zj5YkwxDczabNwYUF6KEF24hGmDAuwcvAJVmG O/XSE0CI2gJKRdbzfteKSlNAU01HBmNme65ooO3SOCKDt2RA6r6oCuTg0XDjqPzF lIuLFbQcLTVRAKT9RkZ0yUDxRp0eG0UN+O9iwdH3WSFlPV1nFElJQH0Vqj5Yb6UO f1ZWcTpYY79NgoBmlcsnW7Sdvh5yXcUfyZojPXV0zo4OSvXekASY+mTJc3G/dBAy 63y8lSaBPSRGNVQzYyMxTiAn+ftylJfnYUJ6wTymL/r6Dyzzie755+0K4XdQYLXY 54qb20phaBo79g7Rvn08 =mwXa -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-19: --- 0 files changed --- ___ 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' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo74599.rtf |8
sw/qa/extras/rtfimport/rtfimport.cxx |7 +++
writerfilter/source/dmapper/DomainMapper.cxx |3 +++
writerfilter/source/filter/ImportFilter.cxx |3 ---
4 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit c76886856411a074a63b273c1709fbeeb005711a
Author: Miklos Vajna
Date: Sat Apr 12 16:15:28 2014 +0200
fdo#74599 RTF import: enable StylesNoDefault compat setting
The Writer 'Heading 3' paragraph style is gray by default, but (just
like in case of DOCX) that shouldn't have any influence on the RTF
import result.
Fix this by moving the compat setting from the DOCX filter
implementation to the common dmapper.
Change-Id: I86c7cf1a66f82b438ce8379467773a88c9e229af
(cherry picked from commit 2df53ef5002270bfe788e383e95002f636a242d9)
Reviewed-on: https://gerrit.libreoffice.org/8945
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/rtfimport/data/fdo74599.rtf
b/sw/qa/extras/rtfimport/data/fdo74599.rtf
new file mode 100644
index 000..b47728f
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo74599.rtf
@@ -0,0 +1,8 @@
+{\rtf1
+{\stylesheet
+{\s3 heading 3;}
+}
+\pard\plain \s3
+This is gray
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 7961519..5bcdcb4 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1615,6 +1615,13 @@ DECLARE_RTFIMPORT_TEST(testFdo74823, "fdo74823.rtf")
CPPUNIT_ASSERT_EQUAL(sal_Int16(5391), getProperty<
uno::Sequence >(xTableRows->getByIndex(1),
"TableColumnSeparators")[2].Position);
}
+DECLARE_RTFIMPORT_TEST(testFdo74599, "fdo74599.rtf")
+{
+uno::Reference
xPropertySet(getStyles("ParagraphStyles")->getByName("Heading 3"),
uno::UNO_QUERY);
+// Writer default styles weren't disabled, so the color was gray, not
default (black).
+CPPUNIT_ASSERT_EQUAL(static_cast(-1),
getProperty(xPropertySet, "CharColor"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 2532942..dbb16d0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -107,6 +107,9 @@ LoggedStream(dmapper_logger, "DomainMapper"),
PropertyNameSupplier::GetPropertyNameSupplier().GetName(
PROP_SURROUND_TEXT_WRAP_SMALL ),
uno::makeAny( true ) );
+// Don't load the default style definitions to avoid weird mix
+m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::makeAny(true));
+
//import document properties
try
{
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index cbbcd3a..0fa211c 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -284,9 +284,6 @@ void WriterFilter::setTargetDocument( const uno::Reference<
lang::XComponent >&
xSettings->setPropertyValue( "TabOverflow", uno::makeAny( sal_True ) );
xSettings->setPropertyValue( "UnbreakableNumberings", uno::makeAny(
sal_True ) );
- // Don't load the default style definitions to avoid weird mix
- xSettings->setPropertyValue( "StylesNoDefault", uno::makeAny( sal_True ) );
-
xSettings->setPropertyValue("FloattableNomargins", uno::makeAny( sal_True
));
xSettings->setPropertyValue( "ClippedPictures", uno::makeAny( sal_True ) );
xSettings->setPropertyValue( "BackgroundParaOverDrawings", uno::makeAny(
sal_True ) );
___
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' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b11605f36d8e5b9dda01fd577e095e4867f1ce5 Author: Christian Lohmaier Date: Tue Apr 15 21:40:48 2014 +0200 bump version to 4.2.5.0.0+ Change-Id: I64f7fc5c4aa1bf32ded94540a6f90b43198a35a7 diff --git a/configure.ac b/configure.ac index b352974..f69d8ab 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.5.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-2-4'
New branch 'libreoffice-4-2-4' available with the following commits: commit 7acc4653fc8623c14af66e9fb36bc0da599487ae Author: Christian Lohmaier Date: Tue Apr 15 21:37:21 2014 +0200 Branch libreoffice-4-2-4 This is 'libreoffice-4-2-4' - the stable branch for the 4.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ib1d7beedb0f5449c16cc1321cf7a89d07c472a33 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-4-2-4'
New branch 'libreoffice-4-2-4' available with the following commits: commit 8ae05953f699a9545ffae358ff1b81e4df3e466e Author: Christian Lohmaier Date: Tue Apr 15 21:36:34 2014 +0200 Branch libreoffice-4-2-4 This is 'libreoffice-4-2-4' - the stable branch for the 4.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I8aa12bfac915e23cd0e1ac098cbe6354a6fca47c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-2-4'
New branch 'libreoffice-4-2-4' available with the following commits: commit 0f2b2fa37079cca17ca4d19ff8fa81233c2c950a Author: Christian Lohmaier Date: Tue Apr 15 21:36:42 2014 +0200 Branch libreoffice-4-2-4 This is 'libreoffice-4-2-4' - the stable branch for the 4.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I724d6181af8511bca2fe3d0b25d585a9d02daf03 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-2-4'
New branch 'libreoffice-4-2-4' available with the following commits: commit fa05e42e100c7a4df7527155d8d2505b7ea293fc Author: Christian Lohmaier Date: Tue Apr 15 21:36:33 2014 +0200 Branch libreoffice-4-2-4 This is 'libreoffice-4-2-4' - the stable branch for the 4.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Idf108707ef778af05b9f6d57e7910121237f9829 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sd/source slideshow/source
sd/source/ui/animations/CustomAnimationCreateDialog.cxx |2
slideshow/source/engine/animationnodes/animationcommandnode.cxx |2
slideshow/source/engine/animationnodes/animationcommandnode.hxx |5
slideshow/source/engine/shapes/appletshape.cxx | 25 -
slideshow/source/engine/shapes/externalshapebase.cxx| 43 ---
slideshow/source/engine/shapes/externalshapebase.hxx| 139
--
slideshow/source/engine/shapes/mediashape.cxx | 26 -
slideshow/source/inc/externalmediashape.hxx | 85 --
slideshow/source/inc/externalshapebase.hxx | 131
+
9 files changed, 160 insertions(+), 298 deletions(-)
New commits:
commit 0ae0301d1cd6e690473f932411ca880c20f45e13
Author: Zolnai Tamás
Date: Tue Apr 15 13:46:46 2014 +0200
Slideshow: remove unneded function duplicates
Change-Id: I682ae771f13e42dd1a4e1cf6a1ee062a5eca640f
diff --git a/slideshow/source/engine/shapes/appletshape.cxx
b/slideshow/source/engine/shapes/appletshape.cxx
index f5de6d8..85ec41f 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -96,11 +96,11 @@ namespace slideshow
virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds )
const SAL_OVERRIDE;
virtual void implViewChanged( const UnoViewSharedPtr& rView )
SAL_OVERRIDE;
virtual void implViewsChanged() SAL_OVERRIDE;
-virtual bool implStartIntrinsicAnimation() SAL_OVERRIDE;
-virtual bool implEndIntrinsicAnimation() SAL_OVERRIDE;
-virtual bool implPauseIntrinsicAnimation() SAL_OVERRIDE;
-virtual bool implIsIntrinsicAnimationPlaying() const SAL_OVERRIDE;
-virtual void implSetIntrinsicAnimationTime(double) SAL_OVERRIDE;
+virtual void play() SAL_OVERRIDE;
+virtual void stop() SAL_OVERRIDE;
+virtual void pause() SAL_OVERRIDE;
+virtual bool isPlaying() const SAL_OVERRIDE;
+virtual void setMediaTime(double) SAL_OVERRIDE;
const OUString maServiceName;
const char**mpPropCopyTable;
@@ -250,7 +250,7 @@ namespace slideshow
-bool AppletShape::implStartIntrinsicAnimation()
+void AppletShape::play()
{
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
@@ -258,42 +258,37 @@ namespace slideshow
_1,
::boost::cref( getBounds() )));
mbIsPlaying = true;
-
-return true;
}
-bool AppletShape::implEndIntrinsicAnimation()
+void AppletShape::stop()
{
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
::boost::mem_fn( &ViewAppletShape::endApplet ) );
mbIsPlaying = false;
-
-return true;
}
-bool AppletShape::implPauseIntrinsicAnimation()
+void AppletShape::pause()
{
// TODO(F1): any way of temporarily disabling/deactivating
// applets?
-return true;
}
-bool AppletShape::implIsIntrinsicAnimationPlaying() const
+bool AppletShape::isPlaying() const
{
return mbIsPlaying;
}
-void AppletShape::implSetIntrinsicAnimationTime(double)
+void AppletShape::setMediaTime(double)
{
// No way of doing this, or?
}
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx
b/slideshow/source/engine/shapes/externalshapebase.cxx
index 00c0766..05ad628 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -73,11 +73,13 @@ namespace slideshow
virtual bool enableAnimations() SAL_OVERRIDE
{
-return mrBase.implStartIntrinsicAnimation();
+mrBase.play();
+return true;
}
virtual bool disableAnimations() SAL_OVERRIDE
{
-return mrBase.implEndIntrinsicAnimation();
+mrBase.stop();
+return true;
}
ExternalShapeBase& mrBase;
@@ -126,43 +128,6 @@ namespace slideshow
return mxShape;
}
-
-
-void ExternalShapeBase::play()
-{
-implStartIntrinsicAnimation();
-}
-
-
-
-void ExternalShapeBase::stop()
-{
-implEndIntrinsicAnimation();
-}
-
-
-
-void ExternalShapeBase::pause()
-{
-implPauseIntrinsicAnimation();
-}
-
-
-
-bool ExternalShapeBase:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b12fcf7ac879905247cf227aa198f6bd89c1a8e4 Author: Christian Lohmaier Date: Tue Apr 15 20:15:21 2014 +0200 Updated core Project: translations 0369496336360265d6c29deb2f65b39acf1b1165 diff --git a/translations b/translations index eab38ba..0369496 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit eab38ba5adf1d1318d19dde70264ece49b3eb26a +Subproject commit 0369496336360265d6c29deb2f65b39acf1b1165 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc
sc/inc/document.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 8987cea59be0e36b1b984ad275c4c54d87d3c429
Author: Eike Rathke
Date: Tue Apr 15 21:13:50 2014 +0200
CID#1202917 removed unused member variable nMaxTableNumber
Change-Id: Ic06e8b7b0eb5f10a76be32ca4aff467f8acd5b8f
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 582d086..e948839 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -374,7 +374,6 @@ private:
sal_uInt16 nInterpretLevel;// >0 if in
interpreter
sal_uInt16 nMacroInterpretLevel; // >0 if macro in
interpreter
sal_uInt16 nInterpreterTableOpLevel; // >0 if in
interpreter TableOp
-SCTAB nMaxTableNumber;
sal_uInt16 nSrcVer;// file version
(load/save)
SCROW nSrcMaxRow; // number of lines to
load/save
sal_uInt16 nFormulaTrackCount;
@@ -538,7 +537,6 @@ public:
bool InsertNewRangeName( const OUString& rName, const ScAddress& rPos,
const OUString& rExpr );
SCTAB GetMaxTableNumber() { return
static_cast(maTabs.size()) - 1; }
-voidSetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber =
nNumber; }
ScRangePairList*GetColNameRanges() { return &xColNameRanges; }
ScRangePairList*GetRowNameRanges() { return &xRowNameRanges; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/t602/t602filter.cxx |8 --
filter/source/t602/t602filter.hxx | 50 +-
2 files changed, 50 insertions(+), 8 deletions(-)
New commits:
commit 95c802719aabaa1aa46519ae60c7b4ecea6016fc
Author: Caolán McNamara
Date: Sat Apr 12 14:43:05 2014 +0100
coverity#707859 Uninitialized pointer field
Change-Id: I1bc431746d9017db2ed2bbde797527e249804a1d
diff --git a/filter/source/t602/t602filter.cxx
b/filter/source/t602/t602filter.cxx
index 98b6b25..5acdfc0 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -131,8 +131,12 @@ namespace T602ImportFilter {
inistruct ini;
-T602ImportFilter::T602ImportFilter(const
::com::sun::star::uno::Reference
&r ) :
-mxMSF( r ) {}
+T602ImportFilter::T602ImportFilter(const
::com::sun::star::uno::Reference
&r )
+: mxMSF(r)
+, mpAttrList(NULL)
+, node(START)
+{
+}
T602ImportFilter::~T602ImportFilter()
{
diff --git a/filter/source/t602/t602filter.hxx
b/filter/source/t602/t602filter.hxx
index 499b678..13b11a6 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -163,7 +163,8 @@ private:
tnode node; // START
-struct {
+struct format602struct
+{
sal_Int16 mt; // row for header
sal_Int16 mb; // row for footer
sal_Int16 tb; // tabs
@@ -173,7 +174,21 @@ private:
sal_Int16 lm; // left border
sal_Int16 rm; // right border
sal_Int16 pl; // page length
-} format602;
+format602struct()
+: mt(0)
+, mb(0)
+, tb(0)
+, ct(0)
+, pn(0)
+, lh(0)
+, lm(0)
+, rm(0)
+, pl(0)
+{
+}
+};
+
+format602struct format602;
// Initialisation constants - they are not changed during the conversion
@@ -181,16 +196,27 @@ private:
// Font state - changes based on font
-struct {
+struct fststruct
+{
fonts nowfnt; // current font
fonts oldfnt; // previous font
bool uline; // underlined
bool olduline;// previous value of uline (font change)
-} fst;
+fststruct()
+: nowfnt(standard)
+, oldfnt(standard)
+, uline(false)
+, olduline(false)
+{
+}
+};
+
+fststruct fst;
// Paragraph state
-struct {
+struct pststruct
+{
sal_Int16 pars;// the number of line endings times
linespacing on the current page
bool comment;// in comments
sal_Int16 wasspace;// 0 there was a space - for
reformatting
@@ -198,7 +224,19 @@ private:
bool ccafterln; // false
bool willbeeop; // false
bool waspar; // false
-} pst;
+pststruct()
+: pars(0)
+, comment(false)
+, wasspace(0)
+, wasfdash(false)
+, ccafterln(false)
+, willbeeop(false)
+, waspar(false)
+{
+}
+};
+
+pststruct pst;
void Reset602();
unsigned char Readchar602();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 'test-bugzilla-files.py' issues
On Tue, Apr 15, 2014 at 8:37 PM, Markus Mohrhard wrote: > > It is a feature that it does not look in sub directories. That allows me > some freedom in organizing documents and moving broken documents around > without too much work. So I would be a bit reluctant to change that behavior > as it will break the script on the server. You can just use a script similar > to the one that I posted for you that iterates over all directories and > inspects each one. > Ok, guess ill just do something like this then: for dir in ./libreofficedocs/* do test-bugzilla-files.py $dir done or : find ./libreofficedocs/ -type d | while read dir do test-bugzilla-files.py $dir done Thanks for the help, Regards, John Smith ___ 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 72287, which changed state. Bug 72287 Summary: [TEMPLATE MANAGER] [START CENTER] [UI] [A11Y] unable to scroll thumbnail view list with keyboard only for selecting available templates/documents in the thumbnail views https://bugs.freedesktop.org/show_bug.cgi?id=72287 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: include/sfx2 sfx2/source
include/sfx2/thumbnailview.hxx|2 +-
sfx2/source/control/thumbnailview.cxx | 15 +++
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 717aa1ac75ddd54fdf72cd4de6551f1fb536da9b
Author: Andrzej Hunt
Date: Tue Apr 15 16:22:53 2014 +0100
fdo#72287 Scroll automatically to show selected item when keyboard used.
806919adf9c9bafbaba92c2d2ab35d2e2f9863f8 added finer-grained scrolling using
the scrollbar / scrollwheel, but inadvertently prevents the display from
scrolling
when an item is selected that is currently offscreen (e.g. by using the
down-arrow
button on the keyboard).
Change-Id: Iaa3a7dc6d214741d37cf4ec78c00ed0034ed1e42
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index afe29c7..068c01e 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -282,7 +282,7 @@ protected:
using Control::ImplInitSettings;
using Window::ImplInit;
-void CalculateItemPositions ();
+void CalculateItemPositions (bool bScrollBarUsed = false);
void MakeItemVisible( sal_uInt16 nId );
SFX2_DLLPRIVATE void ImplInit();
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 742a66f..3326334 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -270,7 +270,7 @@ void ThumbnailView::OnItemDblClicked (ThumbnailViewItem*)
return new ThumbnailViewAcc( this, mbIsTransientChildrenDisabled );
}
-void ThumbnailView::CalculateItemPositions ()
+void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
{
if (!mnItemHeight || !mnItemWidth)
return;
@@ -295,7 +295,7 @@ void ThumbnailView::CalculateItemPositions ()
// calculate window scroll ratio
float nScrollRatio;
-if( mpScrBar )
+if( bScrollBarUsed && mpScrBar )
nScrollRatio = static_cast(mpScrBar->GetThumbPos()) /
static_cast(mpScrBar->GetRangeMax()-2);
else
@@ -351,7 +351,12 @@ void ThumbnailView::CalculateItemPositions ()
nHiddenLines * nItemHeightOffset;
// draw items
-size_t nFirstItem = nHiddenLines * mnCols;
+// Unless we are scrolling (via scrollbar) we just use the precalculated
+// mnFirstLine -- our nHiddenLines calculation takes into account only
+// what the user has done with the scrollbar but not any changes of
selection
+// using the keyboard, meaning we could accidentally hide the selected item
+// if we believe the scrollbar (fdo#72287).
+size_t nFirstItem = (bScrollBarUsed ? nHiddenLines : mnFirstLine) * mnCols;
size_t nLastItem = nFirstItem + (mnVisLines + 1) * mnCols;
maItemListRect.Left() = x;
@@ -433,6 +438,8 @@ void ThumbnailView::CalculateItemPositions ()
mpScrBar->SetPosSizePixel( aPos, aSize );
mpScrBar->SetRangeMax( (nCurCount+mnCols-1)*mnFineness/mnCols);
mpScrBar->SetVisibleSize( mnVisLines );
+if (!bScrollBarUsed)
+mpScrBar->SetThumbPos( (long)mnFirstLine*mnFineness );
long nPageSize = mnVisLines;
if ( nPageSize < 1 )
nPageSize = 1;
@@ -515,7 +522,7 @@ IMPL_LINK( ThumbnailView,ImplScrollHdl, ScrollBar*,
pScrollBar )
{
if ( pScrollBar->GetDelta() )
{
-CalculateItemPositions();
+CalculateItemPositions(true);
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/Library_chartopengl.mk
chart2/Library_chartopengl.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 279d23335e61ee85e74e9ceb9a9b598e14bd49a5 Author: Markus Mohrhard Date: Tue Apr 15 20:51:20 2014 +0200 it made even less sense to have the dependency to mdds here Change-Id: Ia6f4557a26a32ee028eee04fa5babeef8ec3099e diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index 7587196..8bc6b6e 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_set_include,chartopengl,\ $(eval $(call gb_Library_use_externals,chartopengl,\ boost_headers \ - mdds_headers \ glm_headers \ mesa_headers \ glew \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/scopetools.hxx |9
sc/source/core/tool/scopetools.cxx | 11 +
sc/source/ui/view/output2.cxx | 41 +++--
3 files changed, 42 insertions(+), 19 deletions(-)
New commits:
commit 6fa4d31d6a7e363285f22d4c0012521d10073652
Author: Kohei Yoshida
Date: Tue Apr 15 14:47:53 2014 -0400
Use scope switch rather than manual on and off.
Change-Id: Ia4072339b6f1fd4b929d891dcc8f3bb3e2403d5e
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 5a16c2c..f1a1174 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -46,6 +46,15 @@ public:
~UndoSwitch();
};
+class SC_DLLPUBLIC IdleSwitch
+{
+ScDocument& mrDoc;
+bool mbOldValue;
+public:
+IdleSwitch(ScDocument& rDoc, bool bEnableIdle);
+~IdleSwitch();
+};
+
}
#endif
diff --git a/sc/source/core/tool/scopetools.cxx
b/sc/source/core/tool/scopetools.cxx
index a1a52a1..96f4458 100644
--- a/sc/source/core/tool/scopetools.cxx
+++ b/sc/source/core/tool/scopetools.cxx
@@ -45,6 +45,17 @@ UndoSwitch::~UndoSwitch()
mrDoc.EnableUndo(mbOldValue);
}
+IdleSwitch::IdleSwitch(ScDocument& rDoc, bool bEnableIdle) :
+mrDoc(rDoc), mbOldValue(rDoc.IsIdleEnabled())
+{
+mrDoc.EnableIdle(bEnableIdle);
+}
+
+IdleSwitch::~IdleSwitch()
+{
+mrDoc.EnableIdle(mbOldValue);
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 1a625e5..321cf04 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -61,6 +61,7 @@
#include "markdata.hxx"
#include "stlsheet.hxx"
#include "spellcheckcontext.hxx"
+#include
#include
#include
@@ -1443,9 +1444,7 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData,
mpDev->GetExtOutDevData() );
-bool bWasIdleEnabled = mpDoc->IsIdleEnabled();
-mpDoc->EnableIdle(false);
-
+sc::IdleSwitch aIdleSwitch(*mpDoc, false);
ScDrawStringsVars aVars( this, bPixelToLogic );
bool bProgress = false;
@@ -2071,7 +2070,6 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
}
if ( bProgress )
ScProgress::DeleteInterpretProgress();
-mpDoc->EnableIdle(bWasIdleEnabled);
}
ScFieldEditEngine* ScOutputData::CreateOutputEditEngine()
commit 8e50a6c7b1cb9481cce42c71ff07e921fb4292d0
Author: Kohei Yoshida
Date: Tue Apr 15 14:37:47 2014 -0400
Use single std::vector instance in lieu of heap arrays.
Change-Id: I36820b5c3790998eab922a0fa603ac063972c445
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 4b99bcb..1a625e5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1477,6 +1477,7 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
// before processing the cell value.
::boost::ptr_vector aAltPatterns;
+std::vector aDX;
long nPosY = nScrY;
for (SCSIZE nArrY=1; nArrY+1GetTextArray( aString, pDX );
-
-if ( !mpRefDevice->GetConnectMetaFile() ||
-mpRefDevice->GetOutDevType() ==
OUTDEV_PRINTER )
+if (bMetaFile || pFmtDevice != mpDev || aZoomX !=
aZoomY)
{
-double fMul = GetStretch();
-sal_Int32 nLen = aString.getLength();
-for( sal_Int32 i = 0; iGetTextArray(aString, &aDX[0]);
-mpDev->DrawTextArray( aDrawTextPos, aString, pDX );
-delete[] pDX;
+if ( !mpRefDevice->GetConnectMetaFile() ||
+mpRefDevice->GetOutDevType() ==
OUTDEV_PRINTER )
+{
+double fMul = GetStretch();
+for (size_t i = 0; i < nLen; ++i)
+aDX[i] = static_cast(aDX[i]
/ fMul + 0.5);
+}
+
+mpDev->DrawTextArray(aDrawTextPos, aString,
&aDX[0]);
+}
+else
+mpDev->DrawText( aDrawTextPos, aString );
}
-else
-mpDev->DrawText( aDrawTextPos, aString );
if ( bHClip || bVClip )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/inc chart2/source
chart2/inc/DataSeriesState.hxx | 81
chart2/source/view/inc/AbstractShapeFactory.hxx |2
2 files changed, 83 deletions(-)
New commits:
commit 168f26572ab320b210f4b9191ef6f152f01e6a38
Author: Markus Mohrhard
Date: Tue Apr 15 20:39:58 2014 +0200
remove some crap that should not have been pushed
Change-Id: I92b9aa565fc04fb095cedc2a89df468b2f568ea1
diff --git a/chart2/inc/DataSeriesState.hxx b/chart2/inc/DataSeriesState.hxx
deleted file mode 100644
index 061c467..000
--- a/chart2/inc/DataSeriesState.hxx
+++ /dev/null
@@ -1,81 +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/.
- */
-
-#ifndef DATASERIES_HXX
-#define DATASERIES_HXX
-
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-
-namespace chart {
-
-class DataSequence
-{
-public:
-typedef mdds::multi_type_vector
DataSeriesType;
-
-// used for fast iteration through data series
-// allows to easily skip empty data ranges
-DataSeriesType getDataSeries();
-
-size_t size();
-double getValue(size_t nIndex);
-
-private:
-OUString maLabel;
-DataSeriesType maDataSeries;
-
-};
-
-/**
- * point properties overwrite series properties
- */
-struct DataSeriesProperties
-{
-typedef std::map< OUString, com::sun::star::uno::Any > PropertyMap;
-PropertyMap aSeriesProps;
-// we might want to switch to multi_type_vector for better memory usage
-// hopefully this vector is empty most of the time
-std::vector< PropertyMap > aPointProps;
-
-sal_Int32 eMissingValueTreatment;
-};
-
-struct Axis
-{
-double nMin;
-double nMax;
-bool bLog;
-bool bInverseDirection;
-};
-
-struct DataSeriesState
-{
-// length of the data series is min(aXValue.size(), aYValue.size());
-DataSequence aXValue;
-DataSequence aYValue;
-DataSeriesProperties aProperties;
-// also contains bubble chart bubble size
-// apply values to properties with functor
-std::map aMappedProperties;
-Axis aXAxis;
-Axis aYAxis;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index 833380c..b9b247f 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -29,8 +29,6 @@
#include
-#include "DataSeriesState.hxx"
-
namespace chart {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/filters-test.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d67554eb97e787a3881e41e9462b2a6d0e35f64b
Author: Eike Rathke
Date: Tue Apr 15 20:38:07 2014 +0200
CID#1202821 check (unlikely) null return value
Change-Id: Ib5508999b25a238f82dd8dd01b5a42fe5709589e
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 07f3fa2..6f84075 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -506,6 +506,8 @@ void testEnhancedProtectionImpl( ScDocument* pDoc )
{
const ScTableProtection* pProt = pDoc->GetTabProtection(0);
+CPPUNIT_ASSERT( pProt);
+
CPPUNIT_ASSERT( !pProt->isBlockEditable( ScRange( 0, 0, 0, 0, 0, 0))); //
locked
CPPUNIT_ASSERT( pProt->isBlockEditable( ScRange( 0, 1, 0, 0, 1, 0))); //
editable without password
CPPUNIT_ASSERT( pProt->isBlockEditable( ScRange( 0, 2, 0, 0, 2, 0))); //
editable without password
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 'test-bugzilla-files.py' issues
Hey, On Tue, Apr 15, 2014 at 7:20 PM, John Smith wrote: > On Tue, Apr 15, 2014 at 6:53 PM, Markus Mohrhard > wrote: > > > > I already mentioned on IRC that this means it just did not find any test > > files. The connection is working otherwise the NoConnectException would > be > > repeated. You need to make sure that you point to the correct directory > and > > otherwise debug why the script is not finding the files in your case. It > > works for me so I can't tell you what is wrong in your setup. > > > > Hi, > > I think I got it. When I remove the comments before 'print(files)' and > 'print( dirs )', I only see the subdirs below > /usr/local/src/libreofficedocs/, but not the files located in those > subdirs. When I copy a file directly in libreofficedocs, the script > does find it. Looks like test-bugzilla-files.py doesnt descend into > the subdirectory's. Since > 'dev-tools/test-bugzilla-files/test-bugzilla-files.py' created this > directory structure, I assumed that test-bugzilla-files.py would be > able to parse that. > > I know next time nothing about python, but would it be possible and > reasonably easy/quick to make test-bugzilla-files.py look in all > subdirectory's you point it at too ? > > > It is a feature that it does not look in sub directories. That allows me some freedom in organizing documents and moving broken documents around without too much work. So I would be a bit reluctant to change that behavior as it will break the script on the server. You can just use a script similar to the one that I posted for you that iterates over all directories and inspects each one. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/miscdlgs/acredlin.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 699148abdbebb689f6edb7de5011483390b77a5c
Author: Eike Rathke
Date: Tue Apr 15 20:11:06 2014 +0200
CID#1093227: check for (unlikely) null return value
Change-Id: Idca2df07ffdc41b67bf7e126ebec3243501b9cb5
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx
b/sc/source/ui/miscdlgs/acredlin.cxx
index c98935a..d713524 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1364,7 +1364,9 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle,
SvxRedlinTable*, pTable )
{
bool bTheTestFlag = true;
pEntry->EnableChildrenOnDemand(false);
-pTheView->RemoveEntry(pTheView->FirstChild(pEntry));
+SvTreeListEntry* pChildEntry = pTheView->FirstChild(pEntry);
+if (pChildEntry)
+pTheView->RemoveEntry(pChildEntry);
if(pEntryData!=NULL)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 'test-bugzilla-files.py' issues
On Tue, Apr 15, 2014 at 6:53 PM, Markus Mohrhard wrote: > > I already mentioned on IRC that this means it just did not find any test > files. The connection is working otherwise the NoConnectException would be > repeated. You need to make sure that you point to the correct directory and > otherwise debug why the script is not finding the files in your case. It > works for me so I can't tell you what is wrong in your setup. > Hi, I think I got it. When I remove the comments before 'print(files)' and 'print( dirs )', I only see the subdirs below /usr/local/src/libreofficedocs/, but not the files located in those subdirs. When I copy a file directly in libreofficedocs, the script does find it. Looks like test-bugzilla-files.py doesnt descend into the subdirectory's. Since 'dev-tools/test-bugzilla-files/test-bugzilla-files.py' created this directory structure, I assumed that test-bugzilla-files.py would be able to parse that. I know next time nothing about python, but would it be possible and reasonably easy/quick to make test-bugzilla-files.py look in all subdirectory's you point it at too ? Thanks for all the help, Regards, John Smith. # find /usr/local/src/libreofficedocs/ -type d /usr/local/src/libreofficedocs/ /usr/local/src/libreofficedocs/sxg /usr/local/src/libreofficedocs/pgm /usr/local/src/libreofficedocs/wmf /usr/local/src/libreofficedocs/psd /usr/local/src/libreofficedocs/xpm /usr/local/src/libreofficedocs/odb /usr/local/src/libreofficedocs/docx /usr/local/src/libreofficedocs/xlsx /usr/local/src/libreofficedocs/docbook /usr/local/src/libreofficedocs/pbm /usr/local/src/libreofficedocs/pcx /usr/local/src/libreofficedocs/svm /usr/local/src/libreofficedocs/cwk /usr/local/src/libreofficedocs/doc /usr/local/src/libreofficedocs/sgf /usr/local/src/libreofficedocs/sdd_i /usr/local/src/libreofficedocs/xltm /usr/local/src/libreofficedocs/ras /usr/local/src/libreofficedocs/dbf /usr/local/src/libreofficedocs/xltx /usr/local/src/libreofficedocs/cmx /usr/local/src/libreofficedocs/psw /usr/local/src/libreofficedocs/dxf /usr/local/src/libreofficedocs/sds /usr/local/src/libreofficedocs/sdp5 /usr/local/src/libreofficedocs/sti /usr/local/src/libreofficedocs/met /usr/local/src/libreofficedocs/vdx /usr/local/src/libreofficedocs/ppt /usr/local/src/libreofficedocs/potm /usr/local/src/libreofficedocs/sgl5 /usr/local/src/libreofficedocs/pcd /usr/local/src/libreofficedocs/pdb_palm /usr/local/src/libreofficedocs/smf5 /usr/local/src/libreofficedocs/xls /usr/local/src/libreofficedocs/ppotx /usr/local/src/libreofficedocs/pptm /usr/local/src/libreofficedocs/odt /usr/local/src/libreofficedocs/fods /usr/local/src/libreofficedocs/sdd_d /usr/local/src/libreofficedocs/sxs /usr/local/src/libreofficedocs/oth /usr/local/src/libreofficedocs/sxd /usr/local/src/libreofficedocs/sxm /usr/local/src/libreofficedocs/odg /usr/local/src/libreofficedocs/pdb_plucker /usr/local/src/libreofficedocs/otc /usr/local/src/libreofficedocs/602 /usr/local/src/libreofficedocs/tiff /usr/local/src/libreofficedocs/sxc /usr/local/src/libreofficedocs/pptx /usr/local/src/libreofficedocs/otg /usr/local/src/libreofficedocs/otp /usr/local/src/libreofficedocs/xlsm /usr/local/src/libreofficedocs/odm /usr/local/src/libreofficedocs/svg /usr/local/src/libreofficedocs/pict /usr/local/src/libreofficedocs/rtf /usr/local/src/libreofficedocs/docm /usr/local/src/libreofficedocs/eps /usr/local/src/libreofficedocs/fodg /usr/local/src/libreofficedocs/lrf /usr/local/src/libreofficedocs/key /usr/local/src/libreofficedocs/sldm /usr/local/src/libreofficedocs/sdd5 /usr/local/src/libreofficedocs/ppm /usr/local/src/libreofficedocs/sdw /usr/local/src/libreofficedocs/sds5 /usr/local/src/libreofficedocs/mml /usr/local/src/libreofficedocs/odf /usr/local/src/libreofficedocs/odp /usr/local/src/libreofficedocs/fodp /usr/local/src/libreofficedocs/dotm /usr/local/src/libreofficedocs/ppsm /usr/local/src/libreofficedocs/std /usr/local/src/libreofficedocs/cgm /usr/local/src/libreofficedocs/xbm /usr/local/src/libreofficedocs/wks /usr/local/src/libreofficedocs/wpg /usr/local/src/libreofficedocs/wpd /usr/local/src/libreofficedocs/ods /usr/local/src/libreofficedocs/sldx /usr/local/src/libreofficedocs/fb2 /usr/local/src/libreofficedocs/odc /usr/local/src/libreofficedocs/sdc /usr/local/src/libreofficedocs/ott /usr/local/src/libreofficedocs/sdc5 /usr/local/src/libreofficedocs/ots /usr/local/src/libreofficedocs/smf /usr/local/src/libreofficedocs/tga /usr/local/src/libreofficedocs/sxw /usr/local/src/libreofficedocs/pdb /usr/local/src/libreofficedocs/emf /usr/local/src/libreofficedocs/vsd /usr/local/src/libreofficedocs/otf /usr/local/src/libreofficedocs/hwp /usr/local/src/libreofficedocs/stc /usr/local/src/libreofficedocs/fodt /usr/local/src/libreofficedocs/cdr /usr/local/src/libreofficedocs/html /usr/local/src/libreofficedocs/bmp /usr/local/src/libreofficedocs/sxi /usr/local/src/libreofficedocs/ppsx /usr/local/src/libreofficedocs/wps /usr/local/src/libreofficedocs/sdw5 /usr/local/src/lib
Re: 'test-bugzilla-files.py' issues
Hey, On Tue, Apr 15, 2014 at 6:13 PM, John Smith wrote: > Markus, Stephan: > > Thanks. > > I rebuild with './configure --enable-python=internal', but I still get > the same results: > > # pwd > /usr/local/src > # /usr/local/src/libreoffice/instdir/program/python > dev-tools/test-bugzilla-files/test-bugzilla-files.py > --soffice=path:/usr/local/src/libreoffice/instdir/program/soffice > --userdir=file:///tmp/.config/libreoffice/4 > /usr/local/src/libreofficedocs/ > 12128 > OfficeConnection: connecting to: > > uno:pipe,name=pytest548aca44-c4b8-11e3-83c3-000c29d3;urp;StarOffice.ComponentContext > NoConnectException: sleeping... > kill > kill 12128 > > I already mentioned on IRC that this means it just did not find any test files. The connection is working otherwise the NoConnectException would be repeated. You need to make sure that you point to the correct directory and otherwise debug why the script is not finding the files in your case. It works for me so I can't tell you what is wrong in your setup. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: YouCompleteMe support in VIM
Thanks Eike - I'll contact Philippw and see if he has the file on hand. Chris -- View this message in context: http://nabble.documentfoundation.org/YouCompleteMe-support-in-Vim-tp4104984p4105354.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
Re: 'test-bugzilla-files.py' issues
Markus, Stephan: Thanks. I rebuild with './configure --enable-python=internal', but I still get the same results: # pwd /usr/local/src # /usr/local/src/libreoffice/instdir/program/python dev-tools/test-bugzilla-files/test-bugzilla-files.py --soffice=path:/usr/local/src/libreoffice/instdir/program/soffice --userdir=file:///tmp/.config/libreoffice/4 /usr/local/src/libreofficedocs/ 12128 OfficeConnection: connecting to: uno:pipe,name=pytest548aca44-c4b8-11e3-83c3-000c29d3;urp;StarOffice.ComponentContext NoConnectException: sleeping... kill kill 12128 Regards, John Smith. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - oox/source
oox/source/drawingml/customshapes/README| 10 -
oox/source/drawingml/customshapes/generatePresetsCXX.pl | 124
2 files changed, 64 insertions(+), 70 deletions(-)
New commits:
commit a55e2d2a27ac2e2ed7ee439079914d8086610309
Author: Miklos Vajna
Date: Tue Apr 15 17:25:25 2014 +0200
oox: tabs to spaces in generatePresetsCXX.pl
Change-Id: Icc8edbc9d49c4f48dbe9521627dbf5d4e602ffda
diff --git a/oox/source/drawingml/customshapes/generatePresetsCXX.pl
b/oox/source/drawingml/customshapes/generatePresetsCXX.pl
index 7ff58b3..2ce96f5 100755
--- a/oox/source/drawingml/customshapes/generatePresetsCXX.pl
+++ b/oox/source/drawingml/customshapes/generatePresetsCXX.pl
@@ -9,59 +9,59 @@
sub loadSourceCode()
{
- open (IN, ")
- {
- if (/==cscode== /)
- {
- if (/shape name: '/)
- {
- chop;
- s/.*shape name: '([^']+)'.*/$1/;
- $name = $_;
- }
- else
- {
- if (/==cscode== begin/)
- {
- $inside = true;
- @code = ();
- }
- else
- {
- if (/==cscode== end/)
- {
- s/^ <\/([^>]+)>/$1/;
- undef $inside;
- $sources{$name} = [ @code ];
- #print "added ", $name, "\n";
- }
- }
- }
- }
- else
- {
- if ($inside)
- {
- push @code, $_;
- }
- }
- }
-
- close (IN);
-
- return \%sources;
+open (IN, ")
+{
+if (/==cscode== /)
+{
+if (/shape name: '/)
+{
+chop;
+s/.*shape name: '([^']+)'.*/$1/;
+$name = $_;
+}
+else
+{
+if (/==cscode== begin/)
+{
+$inside = true;
+@code = ();
+}
+else
+{
+if (/==cscode== end/)
+{
+s/^ <\/([^>]+)>/$1/;
+undef $inside;
+$sources{$name} = [ @code ];
+#print "added ", $name, "\n";
+}
+}
+}
+}
+else
+{
+if ($inside)
+{
+push @code, $_;
+}
+}
+}
+
+close (IN);
+
+return \%sources;
}
sub startSource
{
- my $count = shift;
+my $count = shift;
- open (OUT, ">customshapepresets" . $count . ".cxx");
- print OUT << "EOS"
+open (OUT, ">customshapepresets" . $count . ".cxx");
+print OUT << "EOS"
// This file was generated by: $0
@@ -123,17 +123,17 @@ sub generateSource
my @classes = ();
foreach $shape (sort(keys %$sources))
{
- push @classes, $shape;
- print OUT "class ShapeC".$shape." : public CustomShapeProvider\n";
- print OUT "{\n";
+push @classes, $shape;
+print OUT "class ShapeC".$shape." : public CustomShapeProvider\n";
+print OUT "{\n";
print OUT " virtual PropertyMap getProperties() SAL_OVERRIDE\n";
- print OUT " {\n";
- print OUT "PropertyMap aPropertyMap;\n\n";
- print OUT @{$sources->{$shape}};
- print OUT "aPropertyMap.setProperty( PROP_Type, OUString(\"ooxml-",
$shape, "\"));\n\n";
- print OUT "return aPropertyMap;\n";
- print OUT " }\n";
- print OUT "};\n";
+print OUT " {\n";
+print OUT "PropertyMap aPropertyMap;\n\n";
+print OUT @{$sources->{$shape}};
+print OUT "aPropertyMap.setProperty( PROP_Type, OUString(\"ooxml-",
$shape, "\"));\n\n";
+print OUT "return aPropertyMap;\n";
+print OUT " }\n";
+print OUT "};\n";
print OUT "\n";
print OUT "// This is a generated source file. DO NOT EDIT.\n";
print OUT "\n";
@@ -143,10 +143,10 @@ sub generateSource
if ($shCount >= 35) {
$shCount = 0;
- endSource ($count, \@classes);
- close OUT;
- startSource (++$count);
- @classes = ();
+endSource ($count, \@classes);
+close OUT;
+startSource (++$count);
+@classes =
[Libreoffice-commits] core.git: 4 commits - solenv/gbuild svx/source
solenv/gbuild/platform/IOS_ARM_GCC.mk |9 +++--
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx |4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 160c5846b1762da88d9713cfae0b80cf746bd71d
Author: Tor Lillqvist
Date: Tue Apr 15 16:08:54 2014 +0300
WaE: unused parameter 'rMediaItem'
Change-Id: Ibe4fd981677446badded650ecf616df0a819e572
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index f2ccab7..5fa946b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -47,11 +47,11 @@
ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
mpMediaWindow->hide();
executeMediaItem( rMediaItem );
}
+#else
+(void) rMediaItem;
#endif
}
-
-
ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj()
{
delete mpMediaWindow;
commit 0774b5556057809a1b7438bd3a67a6ee3c80c3eb
Author: Tor Lillqvist
Date: Tue Apr 15 15:15:41 2014 +0300
I doubt we need these switches
Change-Id: If7b1183384c3931efe73a24a894116be4d827807
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 381d01a..27659c4 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -58,11 +58,9 @@ gb_CXXFLAGS := \
-fsigned-char \
$(CXXFLAGS_CXX11) \
-gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
-
# These are to get the compiler to switch to Objective-C++ or Objective-C mode
-gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
+gb_OBJCXXFLAGS := -x objective-c++
+gb_OBJCFLAGS := -x objective-c
gb_COMPILERDEFS += \
-DBOOST_DETAIL_NO_CONTAINER_FWD
commit 29362f51c38a4d1e5d994ea7adf2b6ae2d0a84cf
Author: Tor Lillqvist
Date: Tue Apr 15 15:13:30 2014 +0300
Move misleading comment
Change-Id: Iaf02671b7d3abc8e096ed817385fc78cead1813c
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index ebc1a90..381d01a 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -58,11 +58,10 @@ gb_CXXFLAGS := \
-fsigned-char \
$(CXXFLAGS_CXX11) \
-# these are to get gcc to switch to Objective-C++ or Objective-C mode
gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
+# These are to get the compiler to switch to Objective-C++ or Objective-C mode
gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-
gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_COMPILERDEFS += \
commit 5346a38c1ffaec6d4bf1921a8e24d5f334e3e79d
Author: Tor Lillqvist
Date: Tue Apr 15 15:11:10 2014 +0300
The -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 is surely left here by accident
Change-Id: Ibc36e4795122167585fb653cc1c4e81fd59f3620
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 0d53585..ebc1a90 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -59,7 +59,7 @@ gb_CXXFLAGS := \
$(CXXFLAGS_CXX11) \
# these are to get gcc to switch to Objective-C++ or Objective-C mode
-gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
+gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 'test-bugzilla-files.py' issues
Hey, On Tue, Apr 15, 2014 at 5:29 PM, John Smith wrote: > On Tue, Apr 15, 2014 at 12:57 PM, Stephan Bergmann > wrote: > > > > * Never start soffice.bin directly, always use soffice instead. > > > Thanks, ill do that from now on. Ive re-tried with using 'soffice' > instead of 'soffice.bin', and the results are the same: using soffice > directly works. > > > > > > * At least in current gerrit.libreoffice.org/dev-tools there is no > dev-tools/test-bugzilla-files.py, > > but only non-executable > dev-tools/test-bugzilla-files/test-bugzilla-files.py > > > Im sorry, I cut n pasted that incorrectly in my email. You are right, > I mean (and have been using) the non-executable > dev-tools/test-bugzilla-files/test-bugzilla-files.py > > > > > > that you need to run as > "/usr/local/src/libreoffice/instdir/program/python > dev-tools/test-bugzilla-files/test-bugzilla-files.py ..." > > > Hrm. I must be doing something wrong with the build then, because i > dont have a '/usr/local/src/libreoffice/instdir/program/python' > > > # find /usr/local/src/libreoffice -name python > /usr/local/src/libreoffice/workdir/ScpTarget/scp2/source/python > /usr/local/src/libreoffice/workdir/ScpPreprocessTarget/scp2/source/python > /usr/local/src/libreoffice/workdir/AutoInstall/python > > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/doc/html/boost/mpi/python > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/boost/python > > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/boost/parameter/aux_/python > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/boost/mpi/python > > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/tools/quickbook/test/python > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/python > > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/python/doc/tutorial/doc/html/python > > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/mpi/example/python > > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/mpi/src/python > > /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/mpi/test/python > /usr/local/src/libreoffice/instdir/share/Scripts/python > /usr/local/src/libreoffice/instdir/sdk/examples/python > /usr/local/src/libreoffice/odk/examples/python > /usr/local/src/libreoffice/sw/qa/python > /usr/local/src/libreoffice/scripting/examples/python > /usr/local/src/libreoffice/scp2/source/python > /usr/local/src/libreoffice/unotest/source/python > > > You need to explicitly enable internal python. Use --enable-pytho=internal to get the internal python. I had a similar problem recently and forgot to put the topic on the ESC agenda. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/cellform.hxx|3 ++
sc/source/core/tool/cellform.cxx | 32 +
sc/source/filter/xml/XMLExportIterator.cxx |3 +-
sc/source/filter/xml/XMLExportIterator.hxx |4 ++-
sc/source/filter/xml/xmlexprt.cxx |9 ++--
5 files changed, 47 insertions(+), 4 deletions(-)
New commits:
commit eec62f3d823048c9b3b767cb7de72650a40b73cd
Author: Kohei Yoshida
Date: Tue Apr 15 10:12:58 2014 -0400
fdo#76409: Write output cell string to element when saving to ods.
The change was made by accident.
Change-Id: Ife2461b0fca6e3ea5a65d72d985d1e0976737b5a
(cherry picked from commit a0752fa4246dc71b64907c679657a1af3cb617e1)
Reviewed-on: https://gerrit.libreoffice.org/9014
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index 1f6b13a..caea246 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -54,6 +54,9 @@ public:
static void GetInputString(
ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString,
SvNumberFormatter& rFormatter,
const ScDocument* pDoc );
+
+static OUString GetOutputString(
+ScDocument& rDoc, const ScAddress& rPos, ScRefCellValue& rCell );
};
#endif
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 6a23ba2..d96430a 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -29,6 +29,7 @@
#include "cellvalue.hxx"
#include "formula/errorcodes.hxx"
#include "sc.hrc"
+#include
// STATIC DATA
// Err527 Workaround
@@ -266,4 +267,35 @@ void ScCellFormat::GetInputString(
rString = aString;
}
+OUString ScCellFormat::GetOutputString( ScDocument& rDoc, const ScAddress&
rPos, ScRefCellValue& rCell )
+{
+if (rCell.isEmpty())
+return EMPTY_OUSTRING;
+
+OUString aVal;
+
+if (rCell.meType == CELLTYPE_EDIT)
+{
+// GetString an der EditCell macht Leerzeichen aus Umbruechen,
+// hier werden die Umbrueche aber gebraucht
+const EditTextObject* pData = rCell.mpEditText;
+if (pData)
+{
+ScFieldEditEngine& rEngine = rDoc.GetEditEngine();
+rEngine.SetText(*pData);
+aVal = rEngine.GetText(LINEEND_LF);
+}
+// Edit-Zellen auch nicht per NumberFormatter formatieren
+// (passend zur Ausgabe)
+}
+else
+{
+// wie in GetString am Dokument (column)
+Color* pColor;
+sal_uLong nNumFmt = rDoc.GetNumberFormat(rPos);
+aVal = GetString(rDoc, rPos, nNumFmt, &pColor, *rDoc.GetFormatTable());
+}
+return aVal;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx
b/sc/source/filter/xml/XMLExportIterator.cxx
index afc05fd..57d03c4 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -657,10 +657,11 @@ void ScMyNotEmptyCellsIterator::UpdateAddress(
table::CellAddress& rAddress )
}
}
-void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell& rMyCell,
table::CellAddress& rAddress )
+void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell& rMyCell, const
table::CellAddress& rAddress )
{
rMyCell.maBaseCell.clear();
rMyCell.aCellAddress = rAddress;
+ScUnoConversion::FillScAddress(rMyCell.maCellAddress,
rMyCell.aCellAddress);
if( (nCellCol == rAddress.Column) && (nCellRow == rAddress.Row) )
{
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx
b/sc/source/filter/xml/XMLExportIterator.hxx
index 857f98c..71d4b58 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -294,6 +294,8 @@ public:
// contains data to export for the current cell position
struct ScMyCell
{
+ScAddress maCellAddress; /// Use this instead of the UNO one.
+
com::sun::star::table::CellAddress aCellAddress;
com::sun::star::table::CellRangeAddress aMergeRange;
com::sun::star::table::CellRangeAddress aMatrixRange;
@@ -355,7 +357,7 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable
SCTAB nCurrentTable;
voidUpdateAddress(
::com::sun::star::table::CellAddress& rAddress );
-voidSetCellData( ScMyCell& rMyCell,
::com::sun::star::table::CellAddress& rAddress );
+void SetCellData( ScMyCell& rMyCell, const css::table::CellAddress&
rAddress );
voidHasAnnotation( ScMyCell& aCell );
public:
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index c2ab4b2..0f157a1 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -64,6 +64,7 @@
#include
#include
#include
+#include
#include
#include
@@ -3280,8 +3281,12 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32
nEqu
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - formula/source include/formula reportdesign/source sc/inc sc/source
formula/source/core/api/token.cxx| 37 ++-
include/formula/tokenarray.hxx | 18 ++---
reportdesign/source/ui/dlg/Formula.cxx |6 ++--
reportdesign/source/ui/inc/Formula.hxx | 13 -
reportdesign/source/ui/misc/UITools.cxx | 11 +++-
sc/inc/tokenarray.hxx|5 ++-
sc/source/core/data/conditio.cxx | 13 +++--
sc/source/core/data/validat.cxx |6 ++--
sc/source/core/tool/formulagroup.cxx |5 ++-
sc/source/core/tool/token.cxx| 29 ++---
sc/source/filter/excel/excform.cxx |6 +---
sc/source/filter/excel/excform8.cxx |4 --
sc/source/filter/excel/frmbase.cxx | 15 --
sc/source/filter/excel/tokstack.cxx | 11 +---
sc/source/filter/excel/xicontent.cxx |2 -
sc/source/filter/excel/xlformula.cxx |6 ++--
sc/source/filter/inc/XclImpChangeTrack.hxx | 14 --
sc/source/filter/inc/excform.hxx |4 +-
sc/source/filter/inc/formel.hxx | 12 ++--
sc/source/filter/inc/lotform.hxx |3 +-
sc/source/filter/inc/qproform.hxx|8 ++---
sc/source/filter/inc/tokstack.hxx| 14 --
sc/source/filter/inc/xlformula.hxx |9 +-
sc/source/filter/lotus/lotform.cxx |4 +-
sc/source/filter/lotus/lotimpop.cxx | 11
sc/source/filter/lotus/op.cxx|6 ++--
sc/source/filter/oox/condformatbuffer.cxx|4 ++
sc/source/filter/qpro/qpro.cxx | 11 +---
sc/source/filter/qpro/qproform.cxx |4 +-
sc/source/filter/xcl97/XclImpChangeTrack.cxx |5 +++
sc/source/ui/formdlg/formula.cxx |2 -
sc/source/ui/unoobj/funcuno.cxx |4 ++
sc/source/ui/unoobj/tokenuno.cxx |2 -
33 files changed, 187 insertions(+), 117 deletions(-)
New commits:
commit 1f87e2e837b4e35b909bf68ccdd3cefd84253940
Author: Kohei Yoshida
Date: Mon Apr 14 16:57:52 2014 -0400
fdo#76294: Properly intern string literals in formula on xls import.
(cherry picked from commit b09426b83c12b0cd27cd909602251cb076ffa4ba)
(cherry picked from commit 625c595fc30d2e6153735dc2ed2359ff4f8a1e3a)
(cherry picked from commit 6bb7fa8df523d3ae7b9945009fb1034f28cb0a0a)
Conflicts:
formula/source/core/api/token.cxx
include/formula/tokenarray.hxx
sc/source/filter/excel/excform.cxx
sc/source/filter/excel/excform8.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/inc/XclImpChangeTrack.hxx
sc/source/filter/inc/lotform.hxx
sc/source/filter/inc/qproform.hxx
sc/source/filter/lotus/lotform.cxx
sc/source/filter/lotus/lotimpop.cxx
sc/source/filter/lotus/op.cxx
reportdesign/source/ui/inc/Formula.hxx
Change-Id: Icf962a4363887f323da6d2bdf935a027df3319fa
Reviewed-on: https://gerrit.libreoffice.org/9008
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 7499a2b..3777d09 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -29,6 +29,7 @@
#include "formula/tokenarray.hxx"
#include "formula/FormulaCompiler.hxx"
#include
+#include
namespace formula
{
@@ -286,12 +287,13 @@ FormulaJumpToken::~FormulaJumpToken()
}
-bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken&
_aToken,ExternalReferenceHelper* /*_pRef*/)
+bool FormulaTokenArray::AddFormulaToken(
+const sheet::FormulaToken& rToken, svl::SharedStringPool& rSPool,
ExternalReferenceHelper* /*pExtRef*/)
{
bool bError = false;
-const OpCode eOpCode = static_cast(_aToken.OpCode); //!
assuming equal values for the moment
+const OpCode eOpCode = static_cast(rToken.OpCode); //!
assuming equal values for the moment
-const uno::TypeClass eClass = _aToken.Data.getValueTypeClass();
+const uno::TypeClass eClass = rToken.Data.getValueTypeClass();
switch ( eClass )
{
case uno::TypeClass_VOID:
@@ -301,14 +303,14 @@ bool FormulaTokenArray::AddFormulaToken(const
sheet::FormulaToken& _aToken,Exter
case uno::TypeClass_DOUBLE:
// double is only used for "push"
if ( eOpCode == ocPush )
-AddDouble( _aToken.Data.get() );
+AddDouble( rToken.Data.get() );
else
bError = true;
break;
case uno::TypeClass_LONG:
{
// long is svIndex, used for name / database area, or "byte"
for spaces
-sal_Int32 nValue = _aToken.Data.get();
+sal_Int32 nValue = rToken.Data.get();
if ( eOpCode == ocDBArea )
Re: 'test-bugzilla-files.py' issues
On 04/15/2014 05:29 PM, John Smith wrote: On Tue, Apr 15, 2014 at 12:57 PM, Stephan Bergmann wrote: that you need to run as "/usr/local/src/libreoffice/instdir/program/python dev-tools/test-bugzilla-files/test-bugzilla-files.py ..." Hrm. I must be doing something wrong with the build then, because i dont have a '/usr/local/src/libreoffice/instdir/program/python' Do you have --enable-python or --disable-python in your autogen.input? For PyUNO to work, certain settings must be present in the Python process. LO's bundled python executable takes care to make those settings, while a stock one won't (or might make the wrong settings for a distro's LO instance). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/Library_chartcore.mk
chart2/Library_chartcore.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 7c6d571e430a6395123f754a33ce6583aee6ed82 Author: Markus Mohrhard Date: Tue Apr 15 02:07:42 2014 +0200 chartcore does not need mdds right now Change-Id: I778d8e05b2c010916fc69c9316895ddc2ca9c725 diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 8de07e2..f62435c 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/p $(eval $(call gb_Library_use_externals,chartcore,\ boost_headers \ - mdds_headers \ glm_headers \ glew \ mesa_headers \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/pch/precompiled_sw.hxx | 67 +++--- 1 file changed, 6 insertions(+), 61 deletions(-) New commits: commit b55f60c0a8a4284cd981979457569e940379b478 Author: Thomas Arnhold Date: Tue Apr 15 17:28:50 2014 +0200 Partially revert "update_pch" This partially reverts commit 8f7aabb35bbb25daf6ace2add902f98361fc One of those headers seems to produce the windows build trouble. Change-Id: Id7e3c39f4c9134ce8de6f5d6dc865afd3f322fd2 diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index e02c026..a90133e 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -41,8 +41,6 @@ #include #include #include -#include -#include #include #include #include @@ -57,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -65,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -84,13 +80,9 @@ #include #include #include -#include -#include -#include #include #include #include -#include #include #include #include @@ -101,7 +93,6 @@ #include #include #include -#include #include #include #include @@ -151,21 +142,14 @@ #include #include #include -#include #include #include -#include #include #include -#include #include -#include #include #include #include -#include -#include -#include #include #include #include @@ -201,9 +185,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -214,9 +198,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -311,13 +293,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -326,7 +306,6 @@ #include #include #include -#include #include #include #include @@ -371,7 +350,6 @@ #include #include #include -#include #include #include #include @@ -385,12 +363,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -406,7 +382,6 @@ #include #include #include -#include #include #include #include @@ -478,6 +453,7 @@ #include #include #include +#include #include #include #include @@ -485,11 +461,7 @@ #include #include #include -#include -#include -#include #include -#include #include #include #include @@ -501,19 +473,18 @@ #include #include #include +#include #include #include #include #include -#include #include -#include #include +#include #include #include #include #include -#include #include #include #include @@ -524,7 +495,6 @@ #include #include #include -#include #include #include #include @@ -611,9 +581,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -665,7 +633,6 @@ #include #include #include -#include #include #include #include @@ -710,7 +677,6 @@ #include #include #include -#include #include #include #include @@ -787,7 +753,6 @@ #include #include #include -#include #include #include #include @@ -825,7 +790,6 @@ #include #include #include -#include #include #include #include @@ -905,18 +869,14 @@ #include #include #include -#include -#include #include #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -972,24 +932,14 @@ #include #include #include -#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include -#include #include #include #include @@ -999,7 +949,6 @@ #include #include #include -#include #include #include #include @@ -1013,7 +962,6 @@ #include #include #include -#include #include #include #include @@ -1026,7 +974,6 @@ #include #include #include -#include #include #include #include @@ -1053,6 +1000,7 @@ #include #include #include +#include #include #include #include @@ -1087,10 +1035,7 @@ #include #include #include -#include #include -#include -#include #include #include #include @@ -1127,11 +1072,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 'test-bugzilla-files.py' issues
On Tue, Apr 15, 2014 at 12:57 PM, Stephan Bergmann wrote: > > * Never start soffice.bin directly, always use soffice instead. > Thanks, ill do that from now on. Ive re-tried with using 'soffice' instead of 'soffice.bin', and the results are the same: using soffice directly works. > > * At least in current gerrit.libreoffice.org/dev-tools there is no > dev-tools/test-bugzilla-files.py, > but only non-executable dev-tools/test-bugzilla-files/test-bugzilla-files.py > Im sorry, I cut n pasted that incorrectly in my email. You are right, I mean (and have been using) the non-executable dev-tools/test-bugzilla-files/test-bugzilla-files.py > > that you need to run as "/usr/local/src/libreoffice/instdir/program/python > dev-tools/test-bugzilla-files/test-bugzilla-files.py ..." > Hrm. I must be doing something wrong with the build then, because i dont have a '/usr/local/src/libreoffice/instdir/program/python' # find /usr/local/src/libreoffice -name python /usr/local/src/libreoffice/workdir/ScpTarget/scp2/source/python /usr/local/src/libreoffice/workdir/ScpPreprocessTarget/scp2/source/python /usr/local/src/libreoffice/workdir/AutoInstall/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/doc/html/boost/mpi/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/boost/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/boost/parameter/aux_/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/boost/mpi/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/tools/quickbook/test/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/python/doc/tutorial/doc/html/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/mpi/example/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/mpi/src/python /usr/local/src/libreoffice/workdir/UnpackedTarball/boost/libs/mpi/test/python /usr/local/src/libreoffice/instdir/share/Scripts/python /usr/local/src/libreoffice/instdir/sdk/examples/python /usr/local/src/libreoffice/odk/examples/python /usr/local/src/libreoffice/sw/qa/python /usr/local/src/libreoffice/scripting/examples/python /usr/local/src/libreoffice/scp2/source/python /usr/local/src/libreoffice/unotest/source/python Regards, John Smith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/cellsuno.hxx|2 -
sc/source/filter/xml/XMLExportIterator.cxx | 22 +++---
sc/source/filter/xml/xmlexprt.cxx | 43 +--
sc/source/ui/unoobj/cellsuno.cxx | 45 -
4 files changed, 28 insertions(+), 84 deletions(-)
New commits:
commit 7963e79361278c14ddf98ac4d9ab3b6cab338129
Author: Kohei Yoshida
Date: Tue Apr 15 11:13:05 2014 -0400
Remove this duplicate, and use the one in ScCellFormat.
Change-Id: I2410c8805ef5be950d5ce1e24f845ed910615442
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 27eb295..c85bf55 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1010,8 +1010,6 @@ public:
virtual void SAL_CALL setActionLocks( sal_Int16 nLock )
throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL resetActionLocks()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-static OUString GetOutputString_Impl(ScDocument* pDoc, const ScAddress&
aPos);
};
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index fbde9f9..1e2a1dc 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6149,49 +6149,18 @@ OUString ScCellObj::GetInputString_Impl(bool bEnglish)
const // fuer getFor
return OUString();
}
-OUString ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress&
aCellPos)
-{
-if (!pDoc)
-return EMPTY_OUSTRING;
-
-ScRefCellValue aCell;
-aCell.assign(*pDoc, aCellPos);
-
-if (aCell.isEmpty())
-return EMPTY_OUSTRING;
-
-OUString aVal;
-
-if (aCell.meType == CELLTYPE_EDIT)
-{
-// GetString an der EditCell macht Leerzeichen aus Umbruechen,
-// hier werden die Umbrueche aber gebraucht
-const EditTextObject* pData = aCell.mpEditText;
-if (pData)
-{
-EditEngine& rEngine = pDoc->GetEditEngine();
-rEngine.SetText(*pData);
-aVal = rEngine.GetText(LINEEND_LF);
-}
-// Edit-Zellen auch nicht per NumberFormatter formatieren
-// (passend zur Ausgabe)
-}
-else
-{
-// wie in GetString am Dokument (column)
-Color* pColor;
-sal_uLong nNumFmt = pDoc->GetNumberFormat( aCellPos );
-aVal = ScCellFormat::GetString(*pDoc, aCellPos, nNumFmt, &pColor,
*pDoc->GetFormatTable());
-}
-return aVal;
-}
-
OUString ScCellObj::GetOutputString_Impl() const
{
ScDocShell* pDocSh = GetDocShell();
OUString aVal;
if ( pDocSh )
-aVal = GetOutputString_Impl(pDocSh->GetDocument(), aCellPos);
+{
+ScDocument* pDoc = pDocSh->GetDocument();
+ScRefCellValue aCell;
+aCell.assign(*pDoc, aCellPos);
+
+aVal = ScCellFormat::GetOutputString(*pDoc, aCellPos, aCell);
+}
return aVal;
}
commit fec4ab14c0f5e0223559e9fd98d7c8d90e58cd18
Author: Kohei Yoshida
Date: Tue Apr 15 11:00:15 2014 -0400
Avoid unnecessarily converting UNO cell address to ScAddress.
Change-Id: I69849b0a16cb353257f9fc1890a27595cd1b7b7b
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx
b/sc/source/filter/xml/XMLExportIterator.cxx
index ff0b419..729ca41 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -94,12 +94,10 @@ bool ScMyShapesContainer::GetFirstAddress(
table::CellAddress& rCellAddress )
void ScMyShapesContainer::SetCellData( ScMyCell& rMyCell )
{
rMyCell.aShapeList.clear();
-ScAddress aAddress;
-ScUnoConversion::FillScAddress( aAddress, rMyCell.aCellAddress );
ScMyShapeList::iterator aItr(aShapeList.begin());
ScMyShapeList::iterator aEndItr(aShapeList.end());
-while( (aItr != aEndItr) && (aItr->aAddress == aAddress) )
+while( (aItr != aEndItr) && (aItr->aAddress == rMyCell.maCellAddress) )
{
rMyCell.aShapeList.push_back(*aItr);
aItr = aShapeList.erase(aItr);
@@ -156,11 +154,8 @@ bool ScMyNoteShapesContainer::GetFirstAddress(
table::CellAddress& rCellAddress
void ScMyNoteShapesContainer::SetCellData( ScMyCell& rMyCell )
{
-ScAddress aAddress;
-ScUnoConversion::FillScAddress( aAddress, rMyCell.aCellAddress );
-
ScMyNoteShapeList::iterator aItr = aNoteShapeList.begin();
-while( (aItr != aNoteShapeList.end()) && (aItr->aPos == aAddress) )
+while( (aItr != aNoteShapeList.end()) && (aItr->aPos ==
rMyCell.maCellAddress) )
{
aItr = aNoteShapeList.erase(aItr);
}
@@ -659,8 +654,6 @@ void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell&
rMyCell, const table::Cel
bool bIsMatrixBase = false;
-ScAddress aScAddress;
-ScUnoConversion::FillScAddress( aScAddress, rMyCell.aCellAddress );
switch (rMyCell.maBaseCell.meType)
{
case CELLTYPE_VALUE:
@@ -678,7 +671,7
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/bb7270a6cab2e3955e06b56dcf5d28becc7e18
6a/bb7270a6cab2e3955e06b56dcf5d28becc7e18 |1 + 1 file changed, 1 insertion(+) New commits: commit 2bf6f69f816f5aaba929a1ac69708e4532d6e766 Author: Caolán McNamara Date: Tue Apr 15 16:14:52 2014 +0100 Notes added by 'git notes add' diff --git a/6a/bb7270a6cab2e3955e06b56dcf5d28becc7e18 b/6a/bb7270a6cab2e3955e06b56dcf5d28becc7e18 new file mode 100644 index 000..fd6cdbd --- /dev/null +++ b/6a/bb7270a6cab2e3955e06b56dcf5d28becc7e18 @@ -0,0 +1 @@ +prefer: 6e61ecd09679a66060f932835622821d39e92f01 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e1/67ff39c21afe06197a0364b20fe211acb8267d
e1/67ff39c21afe06197a0364b20fe211acb8267d |1 + 1 file changed, 1 insertion(+) New commits: commit 9f8154d0a348ab91c493efefc9d77aad2b7b8e03 Author: Caolán McNamara Date: Tue Apr 15 16:13:32 2014 +0100 Notes added by 'git notes add' diff --git a/e1/67ff39c21afe06197a0364b20fe211acb8267d b/e1/67ff39c21afe06197a0364b20fe211acb8267d new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/e1/67ff39c21afe06197a0364b20fe211acb8267d @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OutputDevice code reorganization
On Tue, 2014-04-15 at 10:00 -0500, Norbert Thiebaud wrote: > On Tue, Apr 15, 2014 at 6:25 AM, Chris Sherlock > wrote: > > I have moved outdev.cxx to outdev6.cxx to the directly vcl/source/outdev, > > and into the following files: > > > [...] > > > > I think this largely helps split up the file in a more sensible layout. > > I'm sure ther is plenty of room to bikesheed this to death.. but > 1/ yeah, the output.cxx thing is really not helpful > 2/ the names superficially sound decent > 3/ your're doing the work, and have been working and thinking about > this class for some times now... My only request is that the move be done in such a way that git knows the files have been moved (in a single commit), rather than the old files removed and new one added. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OutputDevice code reorganization
On Tue, Apr 15, 2014 at 6:25 AM, Chris Sherlock wrote: > I have moved outdev.cxx to outdev6.cxx to the directly vcl/source/outdev, > and into the following files: > [...] > > I think this largely helps split up the file in a more sensible layout. I'm sure ther is plenty of room to bikesheed this to death.. but 1/ yeah, the output.cxx thing is really not helpful 2/ the names superficially sound decent 3/ your're doing the work, and have been working and thinking about this class for some times now... so.. +1 from me Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/python3
external/python3/UnpackedTarball_python3.mk|4
external/python3/python-3.3.0-msvc-disable.patch.1 | 76 -
external/python3/python-3.3.0-msvc-x64.patch.1 | 113 --
external/python3/python-3.3.0-ssl.patch.1 | 162 -
4 files changed, 355 deletions(-)
New commits:
commit 4ce1cec2a4c98451b8b686f6f7a114a6927f0cae
Author: Michael Stahl
Date: Tue Apr 15 16:48:59 2014 +0200
python3: remove obsolete MSVC2008 patches
Change-Id: Ie514017dc186fea4c3f2699e92bfe46706eb6413
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 1de6b11..9ca68d5 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -13,10 +13,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3)
$(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
PCbuild/pcbuild.sln \
- PC/VS9.0/pcbuild.sln \
- PC/VS9.0/make_versioninfo.vcproj \
- PC/VS9.0/x64.vsprops \
- PC/VS9.0/_ssl.vcproj \
))
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1
b/external/python3/python-3.3.0-msvc-disable.patch.1
index e9cbef5..6a6a950 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.3.0-msvc-disable.patch.1
@@ -1,81 +1,5 @@
Disable some stuff LO does not need, especially stuff with external
dependencies
-diff -ru python3/PC/VS9.0/pcbuild.sln python3.new/PC/VS9.0/pcbuild.sln
python3/PC/VS9.0/pcbuild.sln 2012-09-29 10:00:47.0 +0200
-+++ python3.new/PC/VS9.0/pcbuild.sln 2012-11-12 22:34:55.365289858 +0100
-@@ -15,16 +15,6 @@
- {C73F0EC1-358B-4177-940F-0846AC8B04CD} =
{C73F0EC1-358B-4177-940F-0846AC8B04CD}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw",
"pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen",
"w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
-- ProjectSection(ProjectDependencies) = postProject
-- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} =
{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-- EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo",
"make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
- EndProject
- Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items",
"Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
-@@ -68,12 +58,6 @@
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3",
"_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- {A1A295E5-463C-437F-81CA-1F32367685DA} =
{A1A295E5-463C-437F-81CA-1F32367685DA}
-- EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj",
"{C6E20F84-3247-4AD6-B051-B073268F73BA}"
- ProjectSection(ProjectDependencies) = postProject
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} =
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-@@ -87,21 +71,6 @@
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
- EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter",
"_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bz2", "_bz2.vcproj",
"{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_lzma", "_lzma.vcproj",
"{F9D71780-F393-11E0-BE50-0800200C9A66}"
-- ProjectSection(ProjectDependencies) = postProject
-- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-- EndProjectSection
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select",
"select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
- ProjectSection(ProjectDependencies) = postProject
- {CF
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx | 24 ++
compilerplugins/clang/unreffun.cxx | 148 +
2 files changed, 172 insertions(+)
New commits:
commit e5199d3d78721c962f53a8675d5245e4b839bdc3
Author: Stephan Bergmann
Date: Tue Apr 15 16:53:51 2014 +0200
Flag unreferrenced functions only declared in the main file, not an include
...which appears to be a good heuristic to identify functions that are
either
unused or should better be declared just once in an include file. (It also
filters out SAL_DLLPUBLIC extern "C" function definitions, which are most
likely
meant to be referenced dynamically via dlsym.)
Change-Id: I7fb78cb836b971791704851535dcfbda2b2f5bc0
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 3d26572..7389f63 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -20,7 +20,9 @@
#include "clang/AST/Type.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/DiagnosticIDs.h"
+#include "clang/Basic/Linkage.h"
#include "clang/Basic/SourceManager.h"
+#include "clang/Basic/Visibility.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/raw_ostream.h"
@@ -52,6 +54,28 @@ inline bool isExternCContext(clang::DeclContext const &
ctxt) {
#endif
}
+#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
+typedef clang::LinkageInfo LinkageInfo;
+#else
+typedef clang::NamedDecl::LinkageInfo LinkageInfo;
+#endif
+
+inline clang::Linkage getLinkage(LinkageInfo const & info) {
+#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
+return info.getLinkage();
+#else
+return info.linkage();
+#endif
+}
+
+inline clang::Visibility getVisibility(LinkageInfo const & info) {
+#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
+return info.getVisibility();
+#else
+return info.visibility();
+#endif
+}
+
inline bool isFirstDecl(clang::FunctionDecl const & decl) {
#if (__clang_major__ == 3 && __clang_minor__ >= 4) || __clang_major__ > 3
return decl.isFirstDecl();
diff --git a/compilerplugins/clang/unreffun.cxx
b/compilerplugins/clang/unreffun.cxx
new file mode 100644
index 000..d49ad29
--- /dev/null
+++ b/compilerplugins/clang/unreffun.cxx
@@ -0,0 +1,148 @@
+/* -*- 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/.
+ */
+
+#include
+#include
+
+#include "clang/AST/Attr.h"
+#include "clang/Sema/SemaInternal.h" // warn_unused_function
+
+#include "compat.hxx"
+#include "plugin.hxx"
+
+namespace {
+
+// It appears that, given a function declaration, there is no way to determine
+// the language linkage of the function's type, only of the function's name
+// (via FunctionDecl::isExternC); however, in a case like
+//
+// extern "C" { static void f(); }
+//
+// the function's name does not have C language linkage while the function's
+// type does (as clarified in C++11 [decl.link]); cf.
+// "Language linkage of function type":
+bool hasCLanguageLinkageType(FunctionDecl const * decl) {
+assert(decl != nullptr);
+if (decl->isExternC()) {
+return true;
+}
+#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
+if (decl->isInExternCContext()) {
+return true;
+}
+#else
+if (decl->getCanonicalDecl()->getDeclContext()->isExternCContext()) {
+return true;
+}
+#endif
+return false;
+}
+
+class UnrefFun: public RecursiveASTVisitor, public loplugin::Plugin {
+public:
+explicit UnrefFun(InstantiationData const & data): Plugin(data) {}
+
+void run() override
+{ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+bool VisitFunctionDecl(FunctionDecl const * decl);
+
+private:
+bool isInUnoIncludeFile(SourceLocation spellingLocation) const;
+};
+
+bool UnrefFun::VisitFunctionDecl(FunctionDecl const * decl) {
+if (ignoreLocation(decl)) {
+return true;
+}
+
+//TODO, filtering out anything template for now:
+if (decl->isDependentContext()) {
+return true;
+}
+CXXRecordDecl const * r = dyn_cast(decl->getDeclContext());;
+if (r != nullptr && r->getTemplateSpecializationKind() != TSK_Undeclared) {
+return true;
+}
+
+FunctionDecl const * canon = decl->getCanonicalDecl();
+//TODO: is that the first?
+if (canon->isDeleted() || canon->isReferenced()
+|| !(canon->isDefined()
+ ? decl->isThisDeclarationADefinition()
+ : compat::isFirstDecl(*decl))
+|| !compat:
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5265586e635d294708f6af10697134a95a26e08 Author: Andras Timar Date: Tue Apr 15 16:39:07 2014 +0200 fdo#74654 fix typo: printnone -> printhigh Change-Id: I286dedfb6dfd8d9c119bf1b6ac777a2a08f22d7e diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index dbe76bd..567e6d6 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1087,7 +1087,7 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet get(mpPrintPermissions, "printing"); get(mpRbPrintNone, "printnone"); get(mpRbPrintLowRes, "printlow"); -get(mpRbPrintHighRes, "printnone"); +get(mpRbPrintHighRes, "printhigh"); get(mpChangesAllowed, "changes"); get(mpRbChangesNone, "changenone"); ___ 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/cellform.hxx|3 ++
sc/source/core/tool/cellform.cxx | 32 +
sc/source/filter/xml/XMLExportIterator.cxx |3 +-
sc/source/filter/xml/XMLExportIterator.hxx |4 ++-
sc/source/filter/xml/xmlexprt.cxx |9 ++--
5 files changed, 47 insertions(+), 4 deletions(-)
New commits:
commit a0752fa4246dc71b64907c679657a1af3cb617e1
Author: Kohei Yoshida
Date: Tue Apr 15 10:12:58 2014 -0400
fdo#76409: Write output cell string to element when saving to ods.
The change was made by accident.
Change-Id: Ife2461b0fca6e3ea5a65d72d985d1e0976737b5a
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index 1f6b13a..caea246 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -54,6 +54,9 @@ public:
static void GetInputString(
ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString,
SvNumberFormatter& rFormatter,
const ScDocument* pDoc );
+
+static OUString GetOutputString(
+ScDocument& rDoc, const ScAddress& rPos, ScRefCellValue& rCell );
};
#endif
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 3e15517..804088d 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -29,6 +29,7 @@
#include "cellvalue.hxx"
#include "formula/errorcodes.hxx"
#include "sc.hrc"
+#include
// STATIC DATA
// Err527 Workaround
@@ -268,4 +269,35 @@ void ScCellFormat::GetInputString(
rString = aString;
}
+OUString ScCellFormat::GetOutputString( ScDocument& rDoc, const ScAddress&
rPos, ScRefCellValue& rCell )
+{
+if (rCell.isEmpty())
+return EMPTY_OUSTRING;
+
+OUString aVal;
+
+if (rCell.meType == CELLTYPE_EDIT)
+{
+// GetString an der EditCell macht Leerzeichen aus Umbruechen,
+// hier werden die Umbrueche aber gebraucht
+const EditTextObject* pData = rCell.mpEditText;
+if (pData)
+{
+ScFieldEditEngine& rEngine = rDoc.GetEditEngine();
+rEngine.SetText(*pData);
+aVal = rEngine.GetText(LINEEND_LF);
+}
+// Edit-Zellen auch nicht per NumberFormatter formatieren
+// (passend zur Ausgabe)
+}
+else
+{
+// wie in GetString am Dokument (column)
+Color* pColor;
+sal_uLong nNumFmt = rDoc.GetNumberFormat(rPos);
+aVal = GetString(rDoc, rPos, nNumFmt, &pColor, *rDoc.GetFormatTable());
+}
+return aVal;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx
b/sc/source/filter/xml/XMLExportIterator.cxx
index 4ec1be5..ff0b419 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -641,10 +641,11 @@ void ScMyNotEmptyCellsIterator::UpdateAddress(
table::CellAddress& rAddress )
}
}
-void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell& rMyCell,
table::CellAddress& rAddress )
+void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell& rMyCell, const
table::CellAddress& rAddress )
{
rMyCell.maBaseCell.clear();
rMyCell.aCellAddress = rAddress;
+ScUnoConversion::FillScAddress(rMyCell.maCellAddress,
rMyCell.aCellAddress);
if( (nCellCol == rAddress.Column) && (nCellRow == rAddress.Row) )
{
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx
b/sc/source/filter/xml/XMLExportIterator.hxx
index 0275dd3..e2180e9 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -278,6 +278,8 @@ public:
// contains data to export for the current cell position
struct ScMyCell
{
+ScAddress maCellAddress; /// Use this instead of the UNO one.
+
com::sun::star::table::CellAddress aCellAddress;
com::sun::star::table::CellRangeAddress aMergeRange;
com::sun::star::table::CellRangeAddress aMatrixRange;
@@ -336,7 +338,7 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable
SCTAB nCurrentTable;
voidUpdateAddress(
::com::sun::star::table::CellAddress& rAddress );
-voidSetCellData( ScMyCell& rMyCell,
::com::sun::star::table::CellAddress& rAddress );
+void SetCellData( ScMyCell& rMyCell, const css::table::CellAddress&
rAddress );
voidHasAnnotation( ScMyCell& aCell );
public:
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 89badd5..2603d05 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -67,6 +67,7 @@
#include
#include
#include
+#include
#include
#include
@@ -3287,8 +3288,12 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32
nEqualCellCount)
else
{
SvXMLElementExport aElemP(*this, sElemP, true, false);
-bool bPrevCharWasSpace(true);
-
GetTextParagraphExport()->exp
[Libreoffice-commits] core.git: 4 commits - chart2/qa dbaccess/qa sc/qa sw/qa
chart2/qa/extras/chart2export.cxx | 18 ++-- dbaccess/qa/unit/hsqldb.cxx|1 sc/qa/extras/scannotationobj.cxx |4 +- sc/qa/extras/scannotationsobj.cxx |4 +- sc/qa/extras/sccellrangeobj.cxx|4 +- sc/qa/extras/scdatabaserangeobj.cxx|4 +- sc/qa/extras/scdatapilotfieldobj.cxx |4 +- sc/qa/extras/scdatapilottableobj.cxx |4 +- sc/qa/extras/sceditfieldobj-cell.cxx |4 +- sc/qa/extras/sceditfieldobj-header.cxx |4 +- sc/qa/extras/scmodelobj.cxx|4 +- sc/qa/extras/scnamedrangeobj.cxx |4 +- sc/qa/extras/scnamedrangesobj.cxx |4 +- sc/qa/extras/scoutlineobj.cxx |4 +- sc/qa/extras/sctablesheetobj.cxx |4 +- sc/qa/extras/sctablesheetsobj.cxx |4 +- sc/qa/unit/opencl-test.cxx |3 +- sc/qa/unit/subsequent_export-test.cxx |2 + sc/qa/unit/subsequent_filters-test.cxx | 46 - sw/qa/core/macros-test.cxx |3 -- 20 files changed, 64 insertions(+), 65 deletions(-) New commits: commit c21f2497c6339f0c456e4a0dae24962bfbb5eda3 Author: Stephan Bergmann Date: Tue Apr 15 16:08:06 2014 +0200 Clean up function declarations and enable some forgotten(?) tests Change-Id: I0e0d05a5b226b5c59798345f402f8a7724d2689a diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index 36d6e17..00933c8 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -112,8 +112,8 @@ void ScAnnontationObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index ab8d142..49874b1 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -95,8 +95,8 @@ void ScAnnontationsObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationsObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 91292bd..59d9986 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -126,8 +126,8 @@ void ScCellRangeObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index 9ed261b..6665ea9 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -85,8 +85,8 @@ void ScDatabaseRangeObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index da8957e..df28860 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -101,8 +101,8 @@ void ScDataPilotFieldObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index f5c1ebf..d210691 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -155,8 +155,8 @@ void ScDataPilotTableObj::tearDown() CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index 49a2583..39ea41c 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -191,8 +191,8 @@ void ScEditFieldObj_Cell::testEditFieldProperties() CPPUNIT_TEST_SUITE_REGISTRATION(ScEditFieldObj_Cell); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx index b596b8c..47ec24c 100644 --- a/sc/qa/extras/sceditfieldobj-header.cxx +++ b/sc/qa/extras/sceditfieldobj-header.cxx @@ -145,8 +145,8 @@ uno::Reference ScEditFieldObj_Header::getTextRange() CPPUNIT_TEST_SUITE_REGISTRATION(ScEditFieldObj_Header); -CPPUNIT_PLUGIN_IMPLEMENT(); - } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index ef12e33..65b2ee0 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/ex
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/store/salbool.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b2ecb3485b6d9b20f752137d4504cb9bb3506a21
Author: Stephan Bergmann
Date: Tue Apr 15 15:42:00 2014 +0200
Better be specific
Change-Id: Ibb9b5b8f53ab8fdeba6d3db295339ead4bde7b6e
diff --git a/compilerplugins/clang/store/salbool.cxx
b/compilerplugins/clang/store/salbool.cxx
index 85790bd..a8f1d21 100644
--- a/compilerplugins/clang/store/salbool.cxx
+++ b/compilerplugins/clang/store/salbool.cxx
@@ -509,7 +509,6 @@ bool SalBool::isInUnoIncludeFile(SourceLocation
spellingLocation) const {
|| name == SRCDIR "/cppuhelper/source/compat.cxx"
|| name == SRCDIR "/sal/osl/all/compat.cxx")
: (name.startswith(SRCDIR "/include/com/")
- || name.startswith(SRCDIR "/include/comphelper/")
|| name.startswith(SRCDIR "/include/cppu/")
|| name.startswith(SRCDIR "/include/cppuhelper/")
|| name.startswith(SRCDIR "/include/osl/")
@@ -518,7 +517,8 @@ bool SalBool::isInUnoIncludeFile(SourceLocation
spellingLocation) const {
|| name.startswith(SRCDIR "/include/salhelper/")
|| name.startswith(SRCDIR "/include/systools/")
|| name.startswith(SRCDIR "/include/typelib/")
- || name.startswith(SRCDIR "/include/uno/"));
+ || name.startswith(SRCDIR "/include/uno/")
+ || name == SRCDIR "/include/comphelper/implbase_var.hxx");
}
bool SalBool::isInSpecialMainFile(SourceLocation spellingLocation) const {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx |8
1 file changed, 8 deletions(-)
New commits:
commit 16691e09ee4e57c9ee9e8988f271f6c0dbe96b6b
Author: Michael Stahl
Date: Tue Apr 15 14:49:47 2014 +0200
sw: -Werror=unused-but-set-variable
Change-Id: Id5bfbb2d55f8659aa3fab8a445d1f84dc4b8bb2b
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index b8b96a6..3e6024e 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3881,7 +3881,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable,
sal_Bool bReadOptions,
break;
case HTML_TABLE_ON:
{
-sal_Bool bTopTable = sal_False;
sal_Bool bHasToFly = sal_False;
SvxAdjust eTabAdjust = SVX_ADJUST_END;
if( !pPendStack )
@@ -3920,13 +3919,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable,
sal_Bool bReadOptions,
}
else
{
-// Wenn wir mitlerweile in einem Rahmen stehen
-// koennen wir erneut eine echte Tabelle aufmachen.
-// Wir erkennen das daran, dass wir keinen
-// Tabellen-Node mehr finden.
-bTopTable = (0 ==
-pPam->GetPoint()->nNode.GetNode().FindTableNode());
-
// Wenn im aktuellen Absatz Flys verankert sind,
// muss die neue Tabelle in einen Rahmen.
bHasToFly = HasCurrentParaFlys(sal_False,sal_True);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - filter/source solenv/bin
filter/source/msfilter/msdffimp.cxx | 27 +++
solenv/bin/modules/installer/windows/msiglobal.pm | 30 +++---
2 files changed, 42 insertions(+), 15 deletions(-)
New commits:
commit e167ff39c21afe06197a0364b20fe211acb8267d
Author: Andre Fischer
Date: Tue Apr 15 11:28:55 2014 +
i124682: Use the right upgrade code for lanaguage sets.
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index db07914..52ab428 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1567,10 +1567,12 @@ sub get_source_codes ($)
Determine values for the product code and upgrade code of the target
version.
-As perparation for building a Windows patch, certain conditions have to be
fullfilled.
- - The upgrade code changes from old to new version
+As preparation for building a Windows patch, certain conditions have to be
fulfilled.
+ - The upgrade code remains the same
- The product code remains the same
- In order to inforce that we have to access information about the source
version.
+ [this is still to be determined. For patches to work we need the same
product codes but
+the install sets install only when the product codes differ.]
+In order to enforce that we have to access information about the source
version.
The resulting values are stored as global variables
$installer::globals::productcode
@@ -1631,6 +1633,28 @@ sub set_global_code_variables ($$)
$installer::logger::Lang->printf("there is no source version =>
created new guids\n");
}
+# Keep the upgrade code constant between versions. Read it from the
codes.txt file.
+# Note that this handles regular installation sets and language packs.
+my $onelanguage = ${$languagesref}[0];
+$installer::logger::Lang->printf("reading upgrade code for language %s
from %s\n",
+$onelanguage,
+$installer::globals::codefilename);
+if (defined $installer::globals::codefilename)
+{
+my $code_filename = $installer::globals::codefilename;
+installer::files::check_file($code_filename);
+my $codefile = installer::files::read_file($code_filename);
+my $searchstring = "UPGRADECODE";
+my $codeblock =
installer::windows::idtglobal::get_language_block_from_language_file(
+$searchstring,
+$codefile);
+$target_upgrade_code =
installer::windows::idtglobal::get_language_string_from_language_block(
+$codeblock,
+$onelanguage,
+"");
+}
+# else use the previously generated upgrade code.
+
$installer::globals::productcode = $target_product_code;
$installer::globals::upgradecode = $target_upgrade_code;
$allvariableshashref->{'PRODUCTCODE'} = $target_product_code;
commit 48653aa3a1cc24ed9ad8a14ae035b38a751e561d
Author: Steve Yin
Date: Tue Apr 15 10:12:14 2014 +
Issue 124661 - crash when loading and re-saving attached ppt file with a
single customshape
check the equation array element number. If the number is greater than 128,
the equation array will not be imported.
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 3066357..430aae9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1996,20 +1996,23 @@ void
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
if ( SeekToContent( DFF_Prop_pFormulas, rIn ) )
rIn >> nNumElem >> nNumElemMem >> nElemSize;
-sal_Int16 nP1, nP2, nP3;
-sal_uInt16 nFlags;
-
-uno::Sequence< rtl::OUString > aEquations( nNumElem );
-for ( i = 0; i < nNumElem; i++ )
+if ( nNumElem <= 128 )
{
-rIn >> nFlags >> nP1 >> nP2 >> nP3;
-aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags, nP1,
nP2, nP3 );
+sal_Int16 nP1, nP2, nP3;
+sal_uInt16 nFlags;
+
+uno::Sequence< rtl::OUString > aEquations( nNumElem );
+for ( i = 0; i < nNumElem; i++ )
+{
+rIn >> nFlags >> nP1 >> nP2 >> nP3;
+aEquations[ i ] = EnhancedCustomShape2d::GetEquation( nFlags,
nP1, nP2, nP3 );
+}
+// pushing the whole Equations element
+const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM (
"Equations" ) );
+aProp.Name = sEquations;
+aProp.Value <<= aEquations;
+aPropVec.push_back( aProp );
}
-// pushing the whole Equations element
-const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM (
"Equations" ) );
-aProp.Name = sEquations;
-aProp.Value <<= aEquations;
-aPropVec.push_back( aProp );
}
[Libreoffice-commits] core.git: svx/source
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 4d3192661e386df577846e890ae634a1c15c7fa5
Author: Tor Lillqvist
Date: Tue Apr 15 14:59:11 2014 +0300
WaE: 'HAVE_FEATURE_DESKTOP' is not defined, evaluates to 0
Change-Id: Idba6bc918f6949f41183f3dc6b2b7492f2f63d6c
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 6881664..f2ccab7 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
#include
#include
@@ -29,14 +30,8 @@
#include
#include "sdrmediawindow.hxx"
-
-
namespace sdr { namespace contact {
-
-// - ViewObjectContactOfSdrMediaObj -
-
-
ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact&
rObjectContact,
ViewContact&
rViewContact,
const
::avmedia::MediaItem& rMediaItem ) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - basic/source bridges/test chart2/source connectivity/source dtrans/test editeng/source extensions/test external/twain sd/source sw/source vbahelper/source x
basic/source/classes/sbunoobj.cxx | 20 -
bridges/test/testoffice.cxx |4
chart2/source/view/inc/VCoordinateSystem.hxx|2
connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx |2
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 20 -
dtrans/test/win32/dnd/atlwindow.hxx |4
dtrans/test/win32/dnd/dndTest.cxx |4
editeng/source/misc/splwrap.cxx |2
extensions/test/ole/OleClient/clientTest.cxx|2
extensions/test/ole/OleConverterVar1/convTest.cxx |2
extensions/test/ole/cppToUno/testcppuno.cxx |2
extensions/test/ole/cpptest/cpptest.cxx |4
extensions/test/ole/unloading/unloadTest.cxx|2
extensions/test/ole/unoTocomCalls/Test/StdAfx.h |4
external/twain/inc/twain/twain.h| 153
+++---
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |2
sd/source/ui/accessibility/AccessibleOutlineView.cxx|2
sw/source/core/crsr/callnk.cxx |2
sw/source/core/unocore/unoidx.cxx |6
vbahelper/source/vbahelper/vbashape.cxx | 14
vbahelper/source/vbahelper/vbashaperange.cxx|2
xmloff/source/style/FillStyleContext.hxx|2
23 files changed, 163 insertions(+), 96 deletions(-)
New commits:
commit 618a0f8c0349daa31cbaea097e2cc60e74f4076d
Author: Thomas Arnhold
Date: Tue Apr 15 13:43:13 2014 +0200
whitespace for include statements
Change-Id: I76bd0ef07a2fa134e948724cecdf539ffe6ccb8a
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 3d8de56..4e40042 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -83,16 +83,16 @@ using namespace com::sun::star::bridge;
using namespace cppu;
-#include
-#include
-#include
-#include
-#include"sbjsmod.hxx"
-#include
-#include
-#include
-
-#include
+#include
+#include
+#include
+#include
+#include "sbjsmod.hxx"
+#include
+#include
+#include
+
+#include
#include
#include
#include
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 8c18fbf..4be87c6 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -96,8 +96,8 @@ void testPipe( const Reference < XMultiServiceFactory > &
rSmgr )
// OSL_ASSERT( 0 );
}
}
-#include
-#include
+#include
+#include
void testWriter( const Reference < XComponent > & rCmp )
{
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx
b/chart2/source/view/inc/VCoordinateSystem.hxx
index 548c1c1..fa2ed6a 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -33,7 +33,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index 758983d..37c870e 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
@@ -23,7 +23,7 @@
#include
-#include
+#include
namespace connectivity
{
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 1ee5a56..ac194d4 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -73,16 +73,16 @@
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
using ::osl::MutexGuard;
diff --git a/dtrans/test/win32/dnd/atlwindow.hxx
b/dtrans/test/win32/dnd/atlwindow.hxx
index 21c5dad..6375657 100644
--- a/dtrans/test/win32/dnd/atlwindow.hxx
+++ b/dtrans/test/win32/dnd/atlwindow.hxx
@@ -20,8 +20,8 @@
#define _WINDOW_HXX_
#include
extern CComModule _Module;
-#include
-#include
+#include
+#include
#include
#include
#include
diff --git a/dtrans/test/win32/dnd/dndTest.cxx
b/dtrans/test/win32/dnd/dndTest.cxx
index 084555e..d026132 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.cxx
@@ -25,8 +25,8 @@
#include
#include
CComModule _Module;
-#include
-#include
+#include
+#include
#if defined _MSC_VER
#pragma warning(pop)
#endif
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwr
OutputDevice code reorganization
Hi all, In my ongoing efforts to refactor, document, understand and generally cleanup OutputDevice, I'm finding it increasingly hard to keep track of the way the files are laid out. Currently the files have very little order. The functions are split out into 6 seperate outdevx.cxx files (where x is a number). I have pushed a private branch to propose a change to the layout: http://cgit.freedesktop.org/libreoffice/core/log/vcl/?h=private/tbsdy/outdev I have moved outdev.cxx to outdev6.cxx to the directly vcl/source/outdev, and into the following files: outdev.cxx (for a variety of clipping functions, etc) outdevnative.cxx outmap.cxx bezier.cxx (for two shared bezier functions) tworect.cxx bitmap.cxx curvedshapes.cxx hatch.cxx gradient.cxx line.cxx polyline.cxx polygon.cxx pixel.cxx rect.cxx wallpaper.cxx blend.cxx transparent.cxx mask.cxx text.cxx font.cxx I think this largely helps split up the file in a more sensible layout. I realise that there is some concern that this might make merging Apache Open Office code with our own, but I feel that the file layout rearrangement really aids in code clarity. Certainly I find it helpful to just be able to look up specific functions in a more intuitive to understand file. I know that it builds - I would just like to get some feedback on the layout before I push it out to master. Chris Sherlock ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - connectivity/source desktop/source framework/inc framework/Library_fwi.mk framework/source include/connectivity svx/source sw/source
connectivity/source/simpledbt/dbtfactory.cxx |3
desktop/source/app/app.cxx |2
framework/Library_fwi.mk |1
framework/inc/threadhelp/lockhelper.hxx| 39
--
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 11 +-
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 11 +-
framework/source/fwi/classes/protocolhandlercache.cxx | 27
+++---
framework/source/fwi/threadhelp/lockhelper.cxx | 37
-
framework/source/helper/statusindicatorfactory.cxx | 11 +-
framework/source/services/desktop.cxx |9 +-
framework/source/services/frame.cxx| 15 +--
include/connectivity/virtualdbtools.hxx|5 +
svx/source/form/dbtoolsclient.cxx | 10 +-
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx |2
sw/source/core/uibase/dbui/swdbtoolsclient.cxx |8 +-
15 files changed, 56 insertions(+), 135 deletions(-)
New commits:
commit dc6175ff1fb317a4536722e2adb5302988316e9a
Author: Jan Holesovsky
Date: Tue Apr 15 12:50:57 2014 +0200
Remove LockHelper::getGlobalMutex().
Do what the TODO suggests - change it to SolarMutex in most cases.
In some cases it is only there to guard a local static, introduce a local
mutex for those.
Change-Id: Idc3155818f737b958b36ee9125e2e9e8cb1b91a1
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 4c56b77..aaaf075 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
framework/source/fwi/helper/shareablemutex \
framework/source/fwi/jobs/configaccess \
framework/source/fwi/jobs/jobconst \
-framework/source/fwi/threadhelp/lockhelper \
framework/source/fwi/threadhelp/transactionmanager \
framework/source/fwi/uielement/constitemcontainer \
framework/source/fwi/uielement/itemcontainer \
diff --git a/framework/inc/threadhelp/lockhelper.hxx
b/framework/inc/threadhelp/lockhelper.hxx
deleted file mode 100644
index eb2260a..000
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ /dev/null
@@ -1,39 +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 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_LOCKHELPER_HXX
-#define INCLUDED_FRAMEWORK_INC_THREADHELP_LOCKHELPER_HXX
-
-#include
-
-#include
-
-namespace osl { class Mutex; }
-
-namespace framework { namespace LockHelper {
-
-//TODO: This presumable should return the SolarMutex, though it actually
returns
-// some independent mutex:
-FWI_DLLPUBLIC osl::Mutex & getGlobalLock();
-
-} }
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 6c345d1..2176727 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -18,7 +18,6 @@
*/
#include
-#include
#include
#include
#include
@@ -199,7 +198,7 @@ void SAL_CALL
ActionTriggerPropertySet::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, const Any& aValue )
throw( Exception, std::exception )
{
-::osl::MutexGuard aGuard( LockHelper::getGlobalLock() );
+SolarMutexGuard aGuard;
// Search for right handle ... and try to set property value.
switch( nHandle )
@@ -229,7 +228,7 @@ throw( Exception, std::exception )
void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue(
Any& aValue, sal_Int32 nHandle ) const
{
-::osl::MutexGuard aGuard( LockHelper::getGlobalLock() );
+SolarMutexGuard aGuard;
// Search for right handle ... and try to get property value.
switch( nHandle )
@@ -265,8 +264,7 @@ void SAL_CALL
ActionTriggerPropertySet::getFastPropertyValue(
if( pIn
[Libreoffice-commits] core.git: Branch 'private/tbsdy/seperateoutdev' - 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: Branch 'private/tbsdy/outdev' - 3 commits - download.lst external/libetonyek oox/CustomTarget_generated.mk oox/Library_oox.mk oox/Package_generated.mk oox/source scp2/s
download.lst |4
external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 | 26 ---
external/libetonyek/UnpackedTarball_libetonyek.mk |5
external/libetonyek/libetonyek-0.0.3-lexical_cast.patch| 56
oox/CustomTarget_generated.mk |6
oox/Library_oox.mk |4
oox/Package_generated.mk |1
oox/source/export/preset-definitions-to-shape-types.pl | 70
+++---
oox/source/export/vmlexport.cxx| 30 +++-
scp2/source/ooo/module_filter.scp | 10 +
sw/source/filter/html/htmlform.cxx | 63 -
sw/source/filter/html/swhtml.hxx |1
12 files changed, 72 insertions(+), 204 deletions(-)
New commits:
commit ab76f36af0c77ce30c6934b7c8f0104d73a1ddf0
Author: Miklos Vajna
Date: Tue Apr 15 12:30:05 2014 +0200
oox: generate data, not code for VML export preset definitions
Change-Id: Ied9171715de948d30b360eb56626b93b695b7b93
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 0b81f11..70aa0d2 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -14,14 +14,14 @@ oox_MISC := $(call
gb_CustomTarget_get_workdir,oox/generated)/misc
oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)
oox_GENHEADERPATH := $(oox_INC)/oox/token
-$(oox_MISC)/vmlexport-shape-types.cxx : \
+$(oox_MISC)/vml-shape-types : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
$(SRCDIR)/oox/source/drawingml/customshapes/presetShapeDefinitions.xml \
$(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml \
$(SRCDIR)/oox/CustomTarget_generated.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1)
mkdir -p $(dir $@)
- perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
+ perl $< --vml-shape-types-data $(filter-out $<,$^) > $@.in_progress 2>
$@.log && mv $@.in_progress $@
$(oox_MISC)/oox-drawingml-adj-names : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
@@ -58,8 +58,8 @@ $(eval $(call oox_GenTarget,properties,property,))
$(eval $(call oox_GenTarget,tokens,token,tokenhash.gperf))
$(call gb_CustomTarget_get_target,oox/generated) : \
- $(oox_MISC)/vmlexport-shape-types.cxx \
$(oox_MISC)/oox-drawingml-adj-names \
+ $(oox_MISC)/vml-shape-types \
$(oox_INC)/tokenhash.inc \
$(oox_INC)/tokennames.inc \
$(oox_INC)/namespacenames.inc \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 007c22f..06f0477 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -296,8 +296,4 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/vml/vmltextbox \
))
-$(eval $(call gb_Library_add_generated_exception_objects,oox,\
-CustomTarget/oox/generated/misc/vmlexport-shape-types \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index e233662..6ed8f83 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Package_Package,oox_generated,$(call
gb_CustomTarget_get_workdi
$(eval $(call gb_Package_add_files,oox_generated,$(LIBO_SHARE_FOLDER)/filter,\
misc/oox-drawingml-adj-names \
+ misc/vml-shape-types \
))
# vim: set noet sw=4 ts=4:
diff --git a/oox/source/export/preset-definitions-to-shape-types.pl
b/oox/source/export/preset-definitions-to-shape-types.pl
index 005d9cd..cd324d1 100644
--- a/oox/source/export/preset-definitions-to-shape-types.pl
+++ b/oox/source/export/preset-definitions-to-shape-types.pl
@@ -22,7 +22,7 @@ use warnings;
sub usage() {
print STDERR <
+Usage: preset-definitions-to-shape-types.pl [ --drawingml-adj-names-data |
--vml-shape-types-data ]
Converts presetShapeDefinitions.xml and presetTextWarpDefinitions.xml to a
.cxx that contains VML with the definitions of the shapes. The result is
@@ -47,10 +47,14 @@ sub show_call_stack
}
my $drawingml_adj_names_data = 0;
+my $vml_shape_types_data = 0;
my $src_shapes = shift;
if ($src_shapes eq "--drawingml-adj-names-data") {
$drawingml_adj_names_data = 1;
$src_shapes = shift;
+} elsif ($src_shapes eq "--vml-shape-types-data") {
+$vml_shape_types_data = 1;
+$src_shapes = shift;
}
my $src_text = shift;
@@ -1191,7 +1195,7 @@ if ( !defined( $result_shapes{'textBox'} ) ) {
"";
}
-# Generate the code
+# Generate the data
if ($drawingml_adj_names_data eq 1) {
foreach my $adj_name (keys %adj_names)
{
@@ -1201,52 +1205,32 @@ if ($drawingml_adj_names_data eq 1) {
}
}
exit 0;
-}
-
-print <
-#include
-
-const char* pShapeTypes[
Re: 'test-bugzilla-files.py' issues
On 04/15/2014 10:23 AM, John Smith wrote: I seem to have some issues starting and/or connecting to soffice in headless mode. When i run 'soffice.bin -env:UserInstallation=file:///tmp/.config/libreoffice/4 --accept="pipe,name=pytest50f337fa-c471-11e3-93ba-000c29d3;urp" --quickstart=no --nofirststartwizard --norestore --nologo --headless --nodefault' 'lsof' shows the soffice pipe is created successfully. But when I run 'dev-tools/test-bugzilla-files.py --soffice=path:/usr/local/src/libreoffice/instdir/program/soffice --userdir=file:///tmp/.config/libreoffice/4 /usr/local/src/libreofficedocs/', the connection fails. The same thing happens when i use sockets instead of named pipes. This listens on a socket: soffice --headless --invisible --nologo --norestore "--accept=socket,port=8100" But this doesnt: python dev-tools/test-bugzilla-files.py --soffice=connect:socket,port=8100 /usr/local/src/libreofficedocs/ 'dev-tools/test-bugzilla-files.py' basically does the same thing as what i do on the command line. If anyone has an idea of what could be going wrong, or where to start troubleshooting, any and all help is appreciated. I cannot reproduce your problems here on recent master. Try to strip down the dev-tools/test-bugzilla-files.py side as much as possible to see why it fails to connect. Some more notes: * Never start soffice.bin directly, always use soffice instead. * At least in current gerrit.libreoffice.org/dev-tools there is no dev-tools/test-bugzilla-files.py, but only non-executable dev-tools/test-bugzilla-files/test-bugzilla-files.py that you need to run as "/usr/local/src/libreoffice/instdir/program/python dev-tools/test-bugzilla-files/test-bugzilla-files.py ..." Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libetonyek
download.lst |4 - external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 | 26 -- external/libetonyek/UnpackedTarball_libetonyek.mk |4 - 3 files changed, 2 insertions(+), 32 deletions(-) New commits: commit ccb606beb5b516dc1308b4a8343f941f22acb1e6 Author: David Tardon Date: Tue Apr 15 12:24:09 2014 +0200 upload libetonyek 0.0.4 (cherry picked from commit d24634a6d4046db208428eb999012c03bd9a5c48) Conflicts: external/libetonyek/UnpackedTarball_libetonyek.mk Change-Id: I64a35ca0902ba40a4fba3080181147b4facac2ee Reviewed-on: https://gerrit.libreoffice.org/9009 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/download.lst b/download.lst index 6ce3dfc..34df117 100644 --- a/download.lst +++ b/download.lst @@ -4,8 +4,8 @@ CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998 export CDR_TARBALL := libcdr-0.0.15.tar.bz2 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978 export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2 -ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4 -export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2 +ETONYEK_MD5SUM := 3c50bc60394d1f2675fbf9bd22581363 +export ETONYEK_TARBALL := libetonyek-0.0.4.tar.bz2 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e diff --git a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 deleted file mode 100644 index 816039b..000 --- a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 +++ /dev/null @@ -1,26 +0,0 @@ -From c2065764ae0826409f1dd683e52b7ca65f092972 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Fri, 6 Dec 2013 18:35:28 +0100 -Subject: [PATCH] Comma at the end of emum list - -Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493 - src/lib/KEYEnum.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h -index f0e027f..9e5e61f 100644 a/src/lib/KEYEnum.h -+++ b/src/lib/KEYEnum.h -@@ -33,7 +33,7 @@ enum KEYCapitalization - KEY_CAPITALIZATION_NONE, - KEY_CAPITALIZATION_ALL_CAPS, - KEY_CAPITALIZATION_SMALL_CAPS, -- KEY_CAPITALIZATION_TITLE, -+ KEY_CAPITALIZATION_TITLE - }; - - } --- -1.8.4.2 - diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index d452574..52e6a95 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ - external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 \ -)) - # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/tbsdy/outdev'
New branch 'private/tbsdy/outdev' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/CustomTarget_generated.mk oox/Library_oox.mk oox/Package_generated.mk oox/source scp2/source
oox/CustomTarget_generated.mk |6 -
oox/Library_oox.mk |4
oox/Package_generated.mk |1
oox/source/export/preset-definitions-to-shape-types.pl | 70 ++---
oox/source/export/vmlexport.cxx| 30 ++-
scp2/source/ooo/module_filter.scp | 10 ++
6 files changed, 66 insertions(+), 55 deletions(-)
New commits:
commit 96e9fdd49b61d6342bde5a71098b3892f59fa38a
Author: Miklos Vajna
Date: Tue Apr 15 12:30:05 2014 +0200
oox: generate data, not code for VML export preset definitions
Change-Id: Ied9171715de948d30b360eb56626b93b695b7b93
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 0b81f11..70aa0d2 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -14,14 +14,14 @@ oox_MISC := $(call
gb_CustomTarget_get_workdir,oox/generated)/misc
oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)
oox_GENHEADERPATH := $(oox_INC)/oox/token
-$(oox_MISC)/vmlexport-shape-types.cxx : \
+$(oox_MISC)/vml-shape-types : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
$(SRCDIR)/oox/source/drawingml/customshapes/presetShapeDefinitions.xml \
$(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml \
$(SRCDIR)/oox/CustomTarget_generated.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1)
mkdir -p $(dir $@)
- perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
+ perl $< --vml-shape-types-data $(filter-out $<,$^) > $@.in_progress 2>
$@.log && mv $@.in_progress $@
$(oox_MISC)/oox-drawingml-adj-names : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
@@ -58,8 +58,8 @@ $(eval $(call oox_GenTarget,properties,property,))
$(eval $(call oox_GenTarget,tokens,token,tokenhash.gperf))
$(call gb_CustomTarget_get_target,oox/generated) : \
- $(oox_MISC)/vmlexport-shape-types.cxx \
$(oox_MISC)/oox-drawingml-adj-names \
+ $(oox_MISC)/vml-shape-types \
$(oox_INC)/tokenhash.inc \
$(oox_INC)/tokennames.inc \
$(oox_INC)/namespacenames.inc \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 007c22f..06f0477 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -296,8 +296,4 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/vml/vmltextbox \
))
-$(eval $(call gb_Library_add_generated_exception_objects,oox,\
-CustomTarget/oox/generated/misc/vmlexport-shape-types \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index e233662..6ed8f83 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Package_Package,oox_generated,$(call
gb_CustomTarget_get_workdi
$(eval $(call gb_Package_add_files,oox_generated,$(LIBO_SHARE_FOLDER)/filter,\
misc/oox-drawingml-adj-names \
+ misc/vml-shape-types \
))
# vim: set noet sw=4 ts=4:
diff --git a/oox/source/export/preset-definitions-to-shape-types.pl
b/oox/source/export/preset-definitions-to-shape-types.pl
index 005d9cd..cd324d1 100644
--- a/oox/source/export/preset-definitions-to-shape-types.pl
+++ b/oox/source/export/preset-definitions-to-shape-types.pl
@@ -22,7 +22,7 @@ use warnings;
sub usage() {
print STDERR <
+Usage: preset-definitions-to-shape-types.pl [ --drawingml-adj-names-data |
--vml-shape-types-data ]
Converts presetShapeDefinitions.xml and presetTextWarpDefinitions.xml to a
.cxx that contains VML with the definitions of the shapes. The result is
@@ -47,10 +47,14 @@ sub show_call_stack
}
my $drawingml_adj_names_data = 0;
+my $vml_shape_types_data = 0;
my $src_shapes = shift;
if ($src_shapes eq "--drawingml-adj-names-data") {
$drawingml_adj_names_data = 1;
$src_shapes = shift;
+} elsif ($src_shapes eq "--vml-shape-types-data") {
+$vml_shape_types_data = 1;
+$src_shapes = shift;
}
my $src_text = shift;
@@ -1191,7 +1195,7 @@ if ( !defined( $result_shapes{'textBox'} ) ) {
"";
}
-# Generate the code
+# Generate the data
if ($drawingml_adj_names_data eq 1) {
foreach my $adj_name (keys %adj_names)
{
@@ -1201,52 +1205,32 @@ if ($drawingml_adj_names_data eq 1) {
}
}
exit 0;
-}
-
-print <
-#include
-
-const char* pShapeTypes[ ESCHER_ShpInst_COUNT ] =
-{
-EOF
-
-for ( my $i = 0; $i < 203; ++$i ) {
-if ( $i < 4 ) {
-print "/* $i - $shapes_ids{$i} - handled separately */\n
NULL,\n";
-}
-else {
-print "/* $i - $shapes_ids{$i} */\n";
-my $out = $result_shapes{$shapes_ids{$i}};
-if ( defined( $out ) ) {
-# set the id
-$out =~ s/__ID__/$i/g;
-
-# escape the '"'s
-$out =~ s/"/\\"/g;
-
-# output as str
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlform.cxx | 63 ++---
sw/source/filter/html/swhtml.hxx |1
2 files changed, 4 insertions(+), 60 deletions(-)
New commits:
commit b720ee5d9d2cb72038bf39ed8af6a7467948ee62
Author: Stephan Bergmann
Date: Tue Apr 15 12:29:25 2014 +0200
The only instantiation of SwHTMLFormPendingStackData_Impl is long gone
...since ff09ed094d6b1d9b41f482a5b349c4fd9e80d857 "INTEGRATION: CWS
ab53: #i47763# synchronous html import," so lets hope that
SetPendingControlSize
was indeed a leftover that would never have been called.
Change-Id: I63f91fbde4dd3162bacdb935e8b0f1e590f1d378
diff --git a/sw/source/filter/html/htmlform.cxx
b/sw/source/filter/html/htmlform.cxx
index 1a78810..6744184 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -634,45 +634,6 @@ static void lcl_html_setFixedFontProperty(
rPropSet->setPropertyValue("FontHeight", aTmp );
}
-class SwHTMLFormPendingStackData_Impl: public SwPendingStackData
-{
-uno::Reference< drawing::XShape > xShape;
-SizeaTextSz;
-sal_BoolbMinWidth;
-sal_BoolbMinHeight;
-
-public:
-SwHTMLFormPendingStackData_Impl(
-const uno::Reference< drawing::XShape > & rShape, const Size&
rTextSz,
-sal_Bool bMinW, sal_Bool bMinH ) :
-xShape( rShape ),
-aTextSz( rTextSz ),
-bMinWidth( bMinW ),
-bMinHeight( bMinH )
-{}
-
-const uno::Reference< drawing::XShape >& GetShape() const { return xShape;
}
-const Size& GetTextSize() const { return aTextSz; }
-sal_Bool IsMinWidth() const { return bMinWidth; }
-sal_Bool IsMinHeight() const { return bMinHeight; }
-};
-
-void SwHTMLParser::SetPendingControlSize()
-{
-OSL_ENSURE( pPendStack, "Wo ist der Pending Stack?" );
-SwHTMLFormPendingStackData_Impl *pData =
-(SwHTMLFormPendingStackData_Impl *)pPendStack->pData;
-
-SwPendingStack* pTmp = pPendStack->pNext;
-delete pPendStack;
-pPendStack = pTmp;
-OSL_ENSURE( !pPendStack, "Wo kommt der Pending-Stack her?" );
-
-SetControlSize( pData->GetShape(), pData->GetTextSize(),
-pData->IsMinWidth(), pData->IsMinHeight() );
-delete pData;
-}
-
void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >&
rShape,
const Size& rTextSz,
sal_Bool bMinWidth,
@@ -1453,11 +1414,7 @@ void SwHTMLParser::EndForm( sal_Bool bAppend )
void SwHTMLParser::InsertInput()
{
-if( pPendStack )
-{
-SetPendingControlSize();
-return;
-}
+assert(pPendStack == 0);
if( !pFormImpl || !pFormImpl->GetFormComps().is() )
return;
@@ -1947,11 +1904,7 @@ void SwHTMLParser::InsertInput()
void SwHTMLParser::NewTextArea()
{
-if( pPendStack )
-{
-SetPendingControlSize();
-return;
-}
+assert(pPendStack == 0);
OSL_ENSURE( !bTextArea, "TextArea in TextArea???" );
OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
@@ -2243,11 +2196,7 @@ void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken
)
void SwHTMLParser::NewSelect()
{
-if( pPendStack )
-{
-SetPendingControlSize();
-return;
-}
+assert(pPendStack == 0);
OSL_ENSURE( !bSelect, "Select in Select???" );
OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
@@ -2467,11 +2416,7 @@ void SwHTMLParser::NewSelect()
void SwHTMLParser::EndSelect()
{
-if( pPendStack )
-{
-SetPendingControlSize();
-return;
-}
+assert(pPendStack == 0);
OSL_ENSURE( bSelect, "keine Select" );
OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 70648b7..86e39fb 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -788,7 +788,6 @@ private:
sal_Bool bHidden = sal_False );
void SetControlSize( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > & rShape, const Size& rTextSz,
sal_Bool bMinWidth, sal_Bool bMinHeight );
-void SetPendingControlSize();
public:
void ResizeDrawObject( SdrObject* pObj, SwTwips nWidth );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/tbsdy/seperateoutdev'
New branch 'private/tbsdy/seperateoutdev' available with the following commits: commit 600dc5ed8213bd802562766487f93df81397f94f Author: Chris Sherlock Date: Tue Apr 15 19:43:57 2014 +1000 Move alpha.cxx contents into bitmap.cxx Change-Id: Ia61c3b28012a493ac1099fbc5ffb9f5199b2ae5e commit 3bf6e6a719e3549c5bba28711f7e98ba5ec3227a Author: Chris Sherlock Date: Tue Apr 15 01:06:48 2014 +1000 Split outdev5.cxx and outdev6.cxx outdev5.cxx deals with curved shapes, so renamed to curvedshapes.cxx Moved polygon functions to polygon.cxx, transparency functions to transparent.cxx, a few miscellaneous functions to outdev.cxx and as the rest of the functions are wallpaper functions then renamed outdev6.cxx to wallpaper.cxx Change-Id: I62a0b66d4d66740fb5f70ecb558db1ad3bf76eb5 commit d09a5a7ee80909460aff1caaf312c2acefd17561 Author: Chris Sherlock Date: Tue Apr 15 00:13:51 2014 +1000 Split outdev3.cxx Split outdev3.cxx into font and text functions Change-Id: I535dbbce055246865d4d5b62fb1ea5b991fb4663 commit ce91bcea5e1932c08b31e640b079dd75e1a3e098 Author: Chris Sherlock Date: Mon Apr 14 23:20:53 2014 +1000 Split outdev2.cxx I have split outdev2.cxx into the following files: + alpha.cxx + bezier.cxx + bitmap.cxx + blend.cxx + gradient.cxx + hatch.cxx + pixel.cxx + polygon.cxx + line.cxx + polyline.cxx + rect.cxx + transparent.cxx I have also moved all the DrawDev functions into outdev.cxx Change-Id: Ica7057250526cd1ed680e5ec173c73265a586ea3 commit 1a5cbbde74685ee7945e12af1caddee7179c9894 Author: Chris Sherlock Date: Mon Apr 14 21:54:43 2014 +1000 Move lines and rectangles to seperate source files Change-Id: I03ef9d09fed831c6d595924f1c681718a89106b2 commit 5cca6eb74206d054b8d51b837bdf1a80a12ac1fc Author: Chris Sherlock Date: Mon Apr 14 21:26:10 2014 +1000 Move line functions into line.cxx and polyline.cxx Reorganized line functions by moving them into seperate line.cxx and polyline.cxx source files. Change-Id: Ifee39cb7f88ed04be2cf7aeb4b46870c404f6eeb commit 721bafee956a480c29992a3fe81e6984c8b95cc5 Author: Chris Sherlock Date: Mon Apr 14 20:38:23 2014 +1000 Remove unnecessary headers from polygon.cxx Change-Id: Ie37e18d5e2d17840ebc0cb55362923ac14371a3d commit 2f272bc127a167d2cf502c23de1b2b3c20070c15 Author: Chris Sherlock Date: Mon Apr 14 20:29:32 2014 +1000 Remove unnecessary includes from hatch.cxx Change-Id: Iaaa28a4e1150d0cdabf4989b0e76a0bf37c14293 commit 83d31127ab0634388100c85aa6357ccbc528565a Author: Chris Sherlock Date: Mon Apr 14 20:19:44 2014 +1000 Remove unnecessary includes from gradient.cxx Change-Id: If85cc6598d67454ca7555d64cac894e84cdb1b01 commit 308278b1ca6c12195144ce7afe052f0a1d322fce Author: Chris Sherlock Date: Mon Apr 14 20:10:29 2014 +1000 Move bezier functions into own source file bezier.cxx Change-Id: I2071b3b1f3bb865075205cb4a90d2e230a8a5ca8 commit f481cb6a2cbe88ce069457b5b411cbf60ec81c40 Author: Chris Sherlock Date: Mon Apr 14 19:39:43 2014 +1000 Don't forget to add polygon as an object in the makefile! Change-Id: Ib4a51d23d80d20e00968929628bbb4966b78c408 commit 279b67b548243966ce24d23fb066e524ebde0cd5 Author: Chris Sherlock Date: Mon Apr 14 18:29:19 2014 +1000 Rename ImplGetGradientColorValue ImplGetGradientColorValue renamed to GetGradientColorValue. Also made it part of the anonymous namespace as it's only used by gradient.cxx Change-Id: I15079b4cef60aa91ecb76ff854e1ddac7d88f31d commit 175730f442904b910369954179d6014f7969cfad Author: Chris Sherlock Date: Mon Apr 14 18:22:39 2014 +1000 Change acessibility level for private functions The following functions should be private members functions of OutputDevice: * DrawComplexGradient * DrawLinearGradient These were previously called ImplDrawComplexGradient and ImplDrawLinearGradient. Change-Id: I4fc996ddd578bca6738128fcc883709359534c95 commit eb529206e41274d1f14a00e1542f183d2f0a094a Author: Chris Sherlock Date: Mon Apr 14 18:17:50 2014 +1000 Reorganize locations of functions in gradient.cxx Change-Id: Ibce763ab4397c4ca4ebce0b25322c249f36499e2 commit f61ca41b8ae2b75d7af45b997c5e803bfa6c7c0e Author: Chris Sherlock Date: Mon Apr 14 18:07:00 2014 +1000 Move hatch functions to own source file. Move outdev4.cxx to hatch.cxx as this now only contains hatch functions. Change-Id: I76fb3c6513045881cd04601e80e3f9a31c2f1f9c commit 44196c523f862f3df839b61859efa1b6ff036f09 Author: Chris Sherlock Date: Sun Apr 13 12:43:54 2014 +1000 Fix typo Change-Id: Iab3ce70bd255aae4e240a76c627a189553ad5937 commit 466b837978ca6aaea654c8fcc2d8b79388d9e840 Author: Chris Sherlock Date: Sun Apr 13 12:35:59 2014 +1000
[Libreoffice-commits] core.git: Branch 'private/tbsdy/seperateoutdev' - 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: download.lst external/libetonyek
download.lst |4
external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 | 26
external/libetonyek/UnpackedTarball_libetonyek.mk |5
external/libetonyek/libetonyek-0.0.3-lexical_cast.patch| 56
--
4 files changed, 2 insertions(+), 89 deletions(-)
New commits:
commit d24634a6d4046db208428eb999012c03bd9a5c48
Author: David Tardon
Date: Tue Apr 15 12:24:09 2014 +0200
upload libetonyek 0.0.4
Change-Id: I64a35ca0902ba40a4fba3080181147b4facac2ee
diff --git a/download.lst b/download.lst
index 12cf008..40f9ff2 100644
--- a/download.lst
+++ b/download.lst
@@ -10,8 +10,8 @@ COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
export COINMP_TARBALL := CoinMP-1.7.6.tgz
EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
-ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
-export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
+ETONYEK_MD5SUM := 3c50bc60394d1f2675fbf9bd22581363
+export ETONYEK_TARBALL := libetonyek-0.0.4.tar.bz2
FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2
MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
diff --git a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1
b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1
deleted file mode 100644
index 816039b..000
--- a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1
+++ /dev/null
@@ -1,26 +0,0 @@
-From c2065764ae0826409f1dd683e52b7ca65f092972 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?=
-Date: Fri, 6 Dec 2013 18:35:28 +0100
-Subject: [PATCH] Comma at the end of emum list
-
-Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493
- src/lib/KEYEnum.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h
-index f0e027f..9e5e61f 100644
a/src/lib/KEYEnum.h
-+++ b/src/lib/KEYEnum.h
-@@ -33,7 +33,7 @@ enum KEYCapitalization
- KEY_CAPITALIZATION_NONE,
- KEY_CAPITALIZATION_ALL_CAPS,
- KEY_CAPITALIZATION_SMALL_CAPS,
-- KEY_CAPITALIZATION_TITLE,
-+ KEY_CAPITALIZATION_TITLE
- };
-
- }
---
-1.8.4.2
-
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 0db9596..52e6a95 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
$(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
- external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 \
- external/libetonyek/libetonyek-0.0.3-lexical_cast.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch
b/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch
deleted file mode 100644
index fbd8bf6..000
--- a/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch
+++ /dev/null
@@ -1,56 +0,0 @@
a/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-01
21:44:51.0 +0100
-+++ b/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-15
06:53:07.474721349 +0100
-@@ -125,7 +125,7 @@
- return KEYSize(size.second, size.first);
- }
-
--bool KEY2ParserUtils::bool_cast(const char *const value)
-+bool KEY2ParserUtils::bool_cast(const char *value)
- {
- KEY2Tokenizer tok;
- switch (tok(value))
-@@ -142,6 +142,16 @@
- return false;
- }
-
-+double KEY2ParserUtils::double_cast(const char *value)
-+{
-+ return lexical_cast(value);
-+}
-+
-+int KEY2ParserUtils::int_cast(const char *value)
-+{
-+ return lexical_cast(value);
-+}
-+
- double KEY2ParserUtils::deg2rad(double value)
- {
- // normalize range
a/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h 2013-10-30
22:04:38.0 +0100
-+++ b/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h 2013-12-15
06:50:40.296884951 +0100
-@@ -81,6 +81,8 @@
- * @returns the boolean value of the string
- */
- static bool bool_cast(const char *value);
-+ static double double_cast(const char *value);
-+ static int int_cast(const char *value);
-
- static double deg2rad(double value);
-
a/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-06
10:36:13.0 +0100
-+++ b/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-15
06:53:45.353451061 +0100
-@@ -62,12 +62,12 @@
-
- optional readDouble(const KEYXMLReader &reader)
- {
-- return readNumber(reader, KEY2Token::f, &lexical_cast);
-+ return readNumber(reader, KEY2Token::f,
&KEY2ParserUtils::double_cast);
- }
-
- optional readInt(const KEYXMLReader &reader)
- {
-- return readNumber(reader, KEY2Token::i, &lexical_cast);
-+ return readNumber(reader, KEY2Token::i, &KEY2ParserUtils::double_cast);
- }
-
- optional readColor(const KEYXMLReader &reader)
Hi, need Libcdr for windows.
Hi, I am looking for libcdr for windows. Please let me now how may i go about it. -- Regards, Ahmed Khatri. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/dialog/tabdlg.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6abb7270a6cab2e3955e06b56dcf5d28becc7e18
Author: Armin Le Grand
Date: Tue Apr 15 09:20:07 2014 +
i124638 As a first step, avoid crash when a TabPage is not found for a
TabDialog, assert this
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 78a0fd5..87eaecd 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1406,10 +1406,11 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *,
pTabCtrl )
// fallback to 1st page when requested one does not exist
if(!pDataObject && pTabCtrl->GetPageCount())
{
+OSL_ENSURE(false, "Requested TabPage not found in the TabDialog,
fallback to 1st page (!)");
pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0));
nId = pTabCtrl->GetCurPageId();
pTabPage = dynamic_cast< SfxTabPage* >(pTabCtrl->GetTabPage(nId));
-Data_Impl* pDataObject = Find(*pImpl->pData, nId);
+pDataObject = Find(*pImpl->pData, nId);
}
DBG_ASSERT( pDataObject, "Id nicht bekannt" );
___
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/ooxmlimport/data/fdo75722-dml.docx |binary sw/qa/extras/ooxmlimport/data/fdo75722-vml.docx |binary 2 files changed New commits: commit f8e0482fd689e3b46f2bfd0bb58ad83408f27c79 Author: Jacobo Aragunde Pérez Date: Tue Apr 15 11:49:04 2014 +0200 fdo#75722: Push missing unit test files Change-Id: If66aadaf0c17c078ab1030e86c3f11af5bd430ab diff --git a/sw/qa/extras/ooxmlimport/data/fdo75722-dml.docx b/sw/qa/extras/ooxmlimport/data/fdo75722-dml.docx new file mode 100644 index 000..ec0b85e Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo75722-dml.docx differ diff --git a/sw/qa/extras/ooxmlimport/data/fdo75722-vml.docx b/sw/qa/extras/ooxmlimport/data/fdo75722-vml.docx new file mode 100644 index 000..72562c8 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo75722-vml.docx differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - oox/source sw/qa sw/source
oox/source/drawingml/customshapeproperties.cxx |6 ++--
oox/source/drawingml/shape.cxx | 19 +++--
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx| 35 +++--
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 29
sw/source/filter/ww8/docxsdrexport.cxx |8 ++---
5 files changed, 79 insertions(+), 18 deletions(-)
New commits:
commit 1393ba60b1eb43b55820f74c393da04308221d97
Author: Jacobo Aragunde Pérez
Date: Mon Apr 14 18:53:34 2014 +0200
fdo#70838: fix rotation transformation in DML exporter
This patch fixes an error in commit
c6ff03f37a6898f50a5ca07152168fb4fe911e05.
And now that fdo#75722 is fixed, I completed the existing unit test
for this bug with absolute position checks.
Change-Id: I76b4fa046db9b946fd23194e91686ffa4fcb5362
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 5f5ecf9..674b496 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -503,16 +503,16 @@ DECLARE_OOXMLEXPORT_TEST(testFdo70838, "fdo70838.docx")
aYPos[2] = getXPathContent(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[3]/mc:Choice/w:drawing/wp:anchor/wp:positionV/wp:posOffset").toInt32();
aYPos[3] = getXPathContent(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[4]/mc:Choice/w:drawing/wp:anchor/wp:positionV/wp:posOffset").toInt32();
-// TODO: compare values with a reference value extracted from the original
document
-// depends on fdo#75722
// certain degree of error is tolerated due to rounding in unit conversions
-CPPUNIT_ASSERT(abs(aXPos[0] - aXPos[1]) < 1000);
-CPPUNIT_ASSERT(abs(aXPos[1] - aXPos[2]) < 1000);
-CPPUNIT_ASSERT(abs(aXPos[2] - aXPos[3]) < 1000);
+CPPUNIT_ASSERT(abs(1239520 - aXPos[0]) < 1000);
+CPPUNIT_ASSERT(abs(1239520 - aXPos[1]) < 1000);
+CPPUNIT_ASSERT(abs(1238250 - aXPos[2]) < 1000);
+CPPUNIT_ASSERT(abs(1238885 - aXPos[3]) < 1000);
-CPPUNIT_ASSERT(abs(aYPos[0] - aYPos[1]) < 1000);
-CPPUNIT_ASSERT(abs(aYPos[1] - aYPos[2]) < 1000);
-CPPUNIT_ASSERT(abs(aYPos[2] - aYPos[3]) < 1000);
+CPPUNIT_ASSERT(abs(2095500 - aYPos[0]) < 1000);
+CPPUNIT_ASSERT(abs(2094865 - aYPos[1]) < 1000);
+CPPUNIT_ASSERT(abs(2094230 - aYPos[2]) < 1000);
+CPPUNIT_ASSERT(abs(2094865 - aYPos[3]) < 1000);
sal_Int32 aHSize[4], aVSize[4];
aHSize[0] = getXPath(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Choice/w:drawing/wp:anchor/wp:extent",
"cx").toInt32();
@@ -586,6 +586,25 @@ DECLARE_OOXMLEXPORT_TEST(testFdo70838, "fdo70838.docx")
} while( nextTokenPos != -1 );
}
+
+// Check shape objects
+
+awt::Point aPos[4];
+aPos[0] = getShape(1)->getPosition();
+aPos[1] = getShape(2)->getPosition();
+aPos[2] = getShape(3)->getPosition();
+aPos[3] = getShape(4)->getPosition();
+
+// certain degree of error is tolerated due to rounding in unit conversions
+CPPUNIT_ASSERT(abs(4734 - aPos[0].X) < 10);
+CPPUNIT_ASSERT(abs(4734 - aPos[1].X) < 10);
+CPPUNIT_ASSERT(abs(4731 - aPos[2].X) < 10);
+CPPUNIT_ASSERT(abs(4733 - aPos[3].X) < 10);
+
+CPPUNIT_ASSERT(abs(2845 - aPos[0].Y) < 10);
+CPPUNIT_ASSERT(abs(2843 - aPos[1].Y) < 10);
+CPPUNIT_ASSERT(abs(2842 - aPos[2].Y) < 10);
+CPPUNIT_ASSERT(abs(2843 - aPos[3].Y) < 10);
}
DECLARE_OOXMLEXPORT_TEST(testFdo73215, "fdo73215.docx")
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index c80cce0..a2cb109 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -85,7 +85,7 @@ OUString lclGetAnchorIdFromGrabBag(const SdrObject* pObj)
return aResult;
}
-void lclMovePositionWithRotation(awt::Point& aPos, sal_Int64 nRotation)
+void lclMovePositionWithRotation(awt::Point& aPos, const Size& rSize,
sal_Int64 nRotation)
{
// code from ImplEESdrWriter::ImplFlipBoundingBox
(filter/source/msfilter/eschesdo.cxx)
// TODO: refactor
@@ -104,8 +104,8 @@ void lclMovePositionWithRotation(awt::Point& aPos,
sal_Int64 nRotation)
double fCos = cos(fVal);
double fSin = sin(fVal);
-double nWidthHalf = (double) aPos.X / 2;
-double nHeightHalf = (double) aPos.Y / 2;
+double nWidthHalf = (double) rSize.Width() / 2;
+double nHeightHalf = (double) rSize.Height() / 2;
double nXDiff = fSin * nHeightHalf + fCos * nWidthHalf - nWidthHalf;
double nYDiff = fSin * nWidthHalf + fCos * nHeightHalf - nHeightHalf;
@@ -303,7 +303,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size& rS
// SdrObjects know their layer, consider that instead of the frame
format.
bOpaque = pObj->GetLayer() != pFrmFmt->GetDoc()->GetHellId() &&
pObj->GetLayer() != pFrmFmt->GetDoc()->GetInvisibleHe
