[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/export-tests.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 55e7aa6022a7d05f79bd9fe6df8a865e3901aecf
Author: Stephan Bergmann
Date: Wed Jun 17 08:58:20 2015 +0200
loplugin:cstylecast
Change-Id: Ia8e0b5ded9f73cf448910593184a0e8936180a12
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 3f52898..f82b523 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -202,7 +202,7 @@ void checkFontAttributes( const SdrTextObj* pObj, ItemValue
nVal)
const ItemType* pAttrib = dynamic_cast((*it).pAttr);
if (pAttrib)
{
-CPPUNIT_ASSERT_EQUAL( nVal, (ItemValue)pAttrib->GetValue());
+CPPUNIT_ASSERT_EQUAL( nVal,
static_cast(pAttrib->GetValue()));
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/ct2n
external/ct2n/ExternalPackage_ct2n.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dc80cd8bc5a9f748580b47c563df92ccb16e6990 Author: Stephan Bergmann Date: Wed Jun 17 08:42:56 2015 +0200 Fix location of bundled ct2n extension Change-Id: If69d7e8e50f1d9725d4b9ca50c754732e9eeddb3 diff --git a/external/ct2n/ExternalPackage_ct2n.mk b/external/ct2n/ExternalPackage_ct2n.mk index ead604e..0373af0 100644 --- a/external/ct2n/ExternalPackage_ct2n.mk +++ b/external/ct2n/ExternalPackage_ct2n.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,ct2n,ConvertTextToNumber)) -$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,share/extensions/ConvertTextToNumber,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,$(LIBO_SHARE_FOLDER)/extensions/ConvertTextToNumber,\ Addons.xcu \ CT2N/MainCode.xba \ CT2N/ToClipbord.xba \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Linking error in headless(--without-x) build
= SOLVED = I was able to fix it myself. For fixing linking error you need to edit "vcl/Library_vcl.mk" ==Before= ifeq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ $(vcl_generic_code) \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ vcl/null/printerinfomanager \ vcl/headless/headlessinst \ )) $(eval $(call gb_Library_use_externals,vcl,\ fontconfig \ freetype \ )) endif == === After ifeq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ $(vcl_generic_code) \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ vcl/null/printerinfomanager \ vcl/headless/headlessinst \ $(vcl_headless_code) \ $(vcl_headless_freetype_code) \ )) $(eval $(call gb_Library_use_libraries,vcl,\ basebmp \ )) $(eval $(call gb_Library_use_externals,vcl,\ fontconfig \ freetype \ )) endif == You also need to add "basebmp" entry because later you would get linking error again because "vcl/headless/svpbmp.cxx" is using "basebmp". After this you would get few other errors as ERROR: Removing file ui-previewer from file list. : ERROR: Removing file shell_scripts_gnome.filelist from file list. : ERROR: Removing file shell_scripts_kde.filelist from file list. : ERROR: Removing file shell_scripts.filelist from file list. Since you don't need these in headless so delete these entries from "workdir/InstallScriptTarget/setup_osl.ins" similar to http://libreoffice-bugs.freedesktop.narkive.com/kFp7vjv9/bug-78857-new-error-source-for-bsh-jar-not-found-when-building-with-java-no Thanks On 16 June 2015 at 22:30, Abhimanyu Singh wrote: > I can build libreoffice(latest code) completely without any error but when > I tried to build it in headless mode as mentioned here > https://wiki.documentfoundation.org/Development/HeadlessBuild > > I am getting linking error for "headlessinst.o" as > > usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o: > In function `HeadlessSalInstance::~HeadlessSalInstance()': > headlessinst.cxx:(.text+0x4f): undefined reference to > `SvpSalInstance::~SvpSalInstance()' > > > What I found surprising that in directory > "workdir/CxxObject/vcl/headless/" only "headlessinst.o" file is there. > There is no file as "svpinst.o" for "svpinst.cxx" which contains definition > of "SvpSalInstance". > > > FYI for full build(without headless option) directory > "workdir/CxxObject/vcl/headless/" contains "svpinst.o" . It is having issue > only in --without-x build. > > > Any help on this would be really great. > > Thanks > > complete log:- > > usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o: > In function `HeadlessSalInstance::~HeadlessSalInstance()': > headlessinst.cxx:(.text+0x4f): undefined reference to > `SvpSalInstance::~SvpSalInstance()' > /usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o: > In function `HeadlessSalInstance::HeadlessSalInstance(SalYieldMutex*)': > headlessinst.cxx:(.text+0xb5): undefined reference to > `SvpSalInstance::SvpSalInstance(SalYieldMutex*)' > /usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o: > In function `CreateSalInstance()': > headlessinst.cxx:(.text+0x31f): undefined reference to > `SvpSalInstance::SvpSalInstance(SalYieldMutex*)' > /usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o: > In function `HeadlessSalInstance::~HeadlessSalInstance()': > headlessinst.cxx:(.text+0x3b): undefined reference to > `SvpSalInstance::~SvpSalInstance()' > /usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o: > In function `HeadlessSalSystem::~HeadlessSalSystem()': > headlessinst.cxx:(.text._ZN17HeadlessSalSystemD2Ev[_ZN17HeadlessSalSystemD5Ev]+0xb): > undefined reference to `SvpSalSystem::~SvpSalSystem()' > /usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o: > In function `HeadlessSalSystem::~HeadlessSalSystem()': > headlessinst.cxx:(.text._ZN17HeadlessSalSystemD0Ev[_ZN17HeadlessSalSystemD0Ev]+0xf): > undefined reference to `SvpSalSystem::~SvpSalSystem()' > /usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o:(.data.rel.ro._ZTI19HeadlessSalInstance[_ZTI19HeadlessSalInstance]+0x10): > undefined reference to `typeinfo for SvpSalInstance' > /usr/local/home/abhimanyusingh/Documents/libreoffice_headless/core/workdir/CxxObject/vcl/headless/headlessinst.o:(.data.rel.ro._ZTI17HeadlessSalSystem[_ZTI17HeadlessSalSystem]+0x10): > undefined reference to `typein
Re: [Libreoffice-commits] core.git: desktop/scripts
Note that any changes to the unopkg script only affect Linux, but neither Mac OS X (which might be unexpected) nor Windows (which is probably expected). On 06/14/2015 11:26 PM, Katarina Behrens wrote: commit 723e099972c16458af79ec0a86097d58576725d6 Author: Katarina Behrens Date: Fri Jun 12 14:03:35 2015 +0200 Don't let root run unopkg without --shared option with the exception of -h|--help. It only makes sense to run unopkg with root priviledges if adding, deleting etc. extensions system-wide for all users (i.e with --shared switch ). In all other cases it only messes up access rights to extensions, so prevent that. Furtheron, running LibO from the root account (and installing root-user-local extensions) is not a supported scenario. Change-Id: I2817f62ae0bb400cefed240e792873f563fbe76e Reviewed-on: https://gerrit.libreoffice.org/16250 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index a9d43bf..6deb032 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh [...] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/options/optaboutconfig.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7a138bee01f96405899cb46cf60a4b9a734e77b1 Author: Stephan Bergmann Date: Wed Jun 17 08:07:43 2015 +0200 loplugin:staticcall Change-Id: I3ae7d03f7c08608f97a1a9ded72d0de31cc625a9 diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 121060d..f2de149 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -254,8 +254,8 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces if(bIsNotLeaf) continue; SvTreeListEntry* pEntry = new SvTreeListEntry; -pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, m_pPrefBox->GetDefaultExpandedNodeImage(), - m_pPrefBox->GetDefaultCollapsedNodeImage(), false)); +pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, SvTreeListBox::GetDefaultExpandedNodeImage(), + SvTreeListBox::GetDefaultCollapsedNodeImage(), false)); pEntry->AddItem( new SvLBoxString( pEntry, 0, sPath)); //It is needed, without this the selection line will be truncated. pEntry->AddItem( new SvLBoxString( pEntry, 0, "")); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2015-06-17
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + tdf#91634: Image hyperlink is not export after roundtrip. in https://gerrit.libreoffice.org/15919 from Yogesh Bharate about module oox, sc + tdf#68016 Write fixture for current behaviour of SfxListener in https://gerrit.libreoffice.org/16318 from Tobias Lippert about module svl + tdf#68016 Make deletion of listeners in SfxBroadcaster faster in https://gerrit.libreoffice.org/16319 from Tobias Lippert about module svl + tdf#68016 Speed up ScChart2DataSequence by caching addresses in https://gerrit.libreoffice.org/16320 from Tobias Lippert about module sc + tdf#68016 Extract ScChart2DataSource to its own file in https://gerrit.libreoffice.org/16315 from Tobias Lippert about module sc + tdf#68016 Move ScChartListenerCollection to its own set of files in https://gerrit.libreoffice.org/16317 from Tobias Lippert about module sc + tdf#68016 Extract ScChart2DataSequence to its own file in https://gerrit.libreoffice.org/16316 from Tobias Lippert about module sc + Breeze: Endnote with i instead of 1 as sifr in https://gerrit.libreoffice.org/16325 from andreas_kainz about module icon-themes + tdf#89226: unit test in https://gerrit.libreoffice.org/16237 from Mike Kaganski about module sc + Fix typos in https://gerrit.libreoffice.org/16314 from Andrea Gelmini about module chart2, connectivity, dbaccess, dtrans, editeng, extensions, filter, forms, fpicker, framework, include, sc, sd, sdext, setup_native, sfx2, shell, svx, sw, unotools, vcl, xmloff + tdf#89226: fix copying ScPostIt* checking for nullptr in https://gerrit.libreoffice.org/16181 from Mike Kaganski about module sc + Make PyUNO provide more Pythonic behaviour in https://gerrit.libreoffice.org/16272 from Matthew Francis about module pyuno End of freshness + fix typo in file name in https://gerrit.libreoffice.org/16330 from Markus Mohrhard about module vcl + update glew to 1.12.0 in https://gerrit.libreoffice.org/16275 from Markus Mohrhard about module build, external, vcl + install blacklist into user profile in https://gerrit.libreoffice.org/16332 from Markus Mohrhard about module vcl + fix a few bugs in blacklist parser in https://gerrit.libreoffice.org/16334 from Markus Mohrhard about module vcl + add license header to blacklist file in https://gerrit.libreoffice.org/16333 from Markus Mohrhard about module vcl + finally enable the blacklist parser in https://gerrit.libreoffice.org/16335 from Markus Mohrhard about module vcl + remove all traces of old device code in https://gerrit.libreoffice.org/16331 from Markus Mohrhard about module vcl + support multiple devices in the blacklist in https://gerrit.libreoffice.org/16329 from Markus Mohrhard about module vcl + rename xml elements as I need to reorganize everything a bit in https://gerrit.libreoffice.org/16328 from Markus Mohrhard about module vcl + first part for server based blacklist in https://gerrit.libreoffice.org/16327 from Markus Mohrhard about module vcl + SfxSimpleHint only needs a sal_uInt32 for the hint in https://gerrit.libreoffice.org/16271 from Noel Grandin about module include + sal_uLong->sal_Int32 in SvtIconChoiceCtrl in https://gerrit.libreoffice.org/16312 from Noel Grandin about module accessibility, cui, dbaccess, include, svtools + Do not mix normal, CTL or CJK attributes in https://gerrit.libreoffice.org/16169 from Matteo Casalin about module sw + cppcheck: variableScope in https://gerrit.libreoffice.org/16208 from Takeshi Abe about module starmath + Replace boost::scoped_array with std::unique_ptr in https://gerrit.libreoffice.org/16289 from Takeshi Abe about module avmedia, basic, canvas, chart2, comphelper, connectivity, cppcanvas, cppu, cppuhelper, cui, dbaccess, desktop, editeng, embeddedobj, extensions, filter, formula, helpcompiler, i18npool, include, jvmfwk, l10ntools, libreofficekit, lingucomponent, lotuswordpro, opencl, sal, sax, sc, sd, sfx2, slideshow, sot, stoc, svgio, svl, svtools, svx, sw, test, ucb, unoxml, vcl, xmloff, xmlsecurity * Merged changes on master for project core changed in the last 25 hours: + Change table to tree view in Expert Configuration dialog. in https://gerrit.libreoffice.org/16307 from Mihály Palenik + Fix typos in https://gerrit.libreoffice.org/16309 from Andrea Gelmini + Use template function to reduce copy'n'pasta code in https://gerrit.libreoffice.org/16308 from Katarina Behrens + Make track changes sidebar an experimental feature as its incomplete in https://gerrit.libreoffice.org/15995 from Yousuf Philips + Fix typos in https://gerrit.libreoffice.org/16310 from Andrea Gelmini + tdf#91909 Uno commands for slide navigation and sorting in https://gerrit.libreoffice.org/16211 from Philippe Jung + Line Section reorganisation in https://gerrit.libreoffice.org/16264 from Risha
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source
cui/source/dialogs/cuicharmap.cxx | 17 ++---
cui/source/inc/cuicharmap.hxx |1 +
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit efc5602dd3a2c2c138e0290e58ed1527523e4dcf
Author: Tomaž Vajngerl
Date: Wed Jun 17 14:10:09 2015 +0900
tdf#91748 fix preview of special characters
Change-Id: Icf18e8be2ec07bb4bcd6edce3e41a6e88ecefca7
(cherry picked from commit 56d62036862462ca7147686268558a754613858f)
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 9589423..89f63ef 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -184,6 +184,8 @@ VCL_BUILDER_FACTORY(SvxShowText)
void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
+rRenderContext.SetFont(maFont);
+
Color aTextCol = rRenderContext.GetTextColor();
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
@@ -268,13 +270,14 @@ void SvxShowText::Paint(vcl::RenderContext&
rRenderContext, const Rectangle&)
void SvxShowText::SetFont( const vcl::Font& rFont )
{
long nWinHeight = GetOutputSizePixel().Height();
-vcl::Font aFont = rFont;
-aFont.SetWeight( WEIGHT_NORMAL );
-aFont.SetAlign( ALIGN_TOP );
-aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
-aFont.SetTransparent( true );
-Control::SetFont( aFont );
-mnY = ( nWinHeight - GetTextHeight() ) / 2;
+maFont = vcl::Font(rFont);
+maFont.SetWeight(WEIGHT_NORMAL);
+maFont.SetAlign(ALIGN_TOP);
+maFont.SetSize(PixelToLogic(Size(0, nWinHeight / 2)));
+maFont.SetTransparent(true);
+Control::SetFont(maFont);
+
+mnY = (nWinHeight - GetTextHeight()) / 2;
Invalidate();
}
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 3a65325..d06f55a 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -55,6 +55,7 @@ protected:
private:
longmnY;
boolmbCenter;
+vcl::Font maFont;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuicharmap.cxx | 17 ++---
cui/source/inc/cuicharmap.hxx |1 +
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 56d62036862462ca7147686268558a754613858f
Author: Tomaž Vajngerl
Date: Wed Jun 17 14:10:09 2015 +0900
tdf#91748 fix preview of special characters
Change-Id: Icf18e8be2ec07bb4bcd6edce3e41a6e88ecefca7
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 3e4afde..319ca04 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -184,6 +184,8 @@ VCL_BUILDER_FACTORY(SvxShowText)
void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
+rRenderContext.SetFont(maFont);
+
Color aTextCol = rRenderContext.GetTextColor();
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
@@ -268,13 +270,14 @@ void SvxShowText::Paint(vcl::RenderContext&
rRenderContext, const Rectangle&)
void SvxShowText::SetFont( const vcl::Font& rFont )
{
long nWinHeight = GetOutputSizePixel().Height();
-vcl::Font aFont = rFont;
-aFont.SetWeight( WEIGHT_NORMAL );
-aFont.SetAlign( ALIGN_TOP );
-aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
-aFont.SetTransparent( true );
-Control::SetFont( aFont );
-mnY = ( nWinHeight - GetTextHeight() ) / 2;
+maFont = vcl::Font(rFont);
+maFont.SetWeight(WEIGHT_NORMAL);
+maFont.SetAlign(ALIGN_TOP);
+maFont.SetSize(PixelToLogic(Size(0, nWinHeight / 2)));
+maFont.SetTransparent(true);
+Control::SetFont(maFont);
+
+mnY = (nWinHeight - GetTextHeight()) / 2;
Invalidate();
}
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 3a65325..d06f55a 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -55,6 +55,7 @@ protected:
private:
longmnY;
boolmbCenter;
+vcl::Font maFont;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Windows build time: 50% longer....
On Windows we use to build on tb65 in 30 minutes flat. for example http://ci.libreoffice.org/job/lo_gerrit_master/Gerrit=Gerrit,Platform=Windows/2776/ or http://ci.libreoffice.org/job/lo_gerrit_master/Gerrit=Gerrit,Platform=Windows/2769/ but currently on master this is more ~45 minutes That is a big hit, especially with Windows being currently my limiting factor wrt to build ressources. from what I could acertain so for.. it _seems_ like the hot what somewhere in: 4618d15cb73d0f0c15e0f4d2a6ce9cdbe6eeef24 Simplify 824cda403206b61af20ed86aead59cfaddb6ac83 Fix indentation 549e8285b2b57797d72fd064d947da522471a6b9 Use size_t for GetMemberCount/GetMember b75c104ace039cff957696ea3de091f60b26c918 0 is fine here 50ad242fe9acb366c8e0d1fa8d0de7cdb579eecb Tango updates 8ab34380319a91d72b315e4c2cc8a7e76b1361a4 sc: Notify about the part change when searching. 9b06d36571bbfa2d722f36610375e7cd24be81a7 reenable JunitTest_dbaccess_complex part RowSet f9525cb4e8174a11da5624de3c271f5c40e5f0c5 tweaks d6d19acaca14d5b45ffb0db0028f17567d196c4d do not try to get bookmark when in invalid position b4e6dd8200145b6fa950cf813826e92a5caac1a5 handle getParameters being called before execute() ab873b04e6ab0ceb7750db2d105ef5e3d0c0f6ef janitorial 99c6e8dc1fdabcc5af24a7a3cc8ff510140b0c94 HSQLDB connection flush: safer handling when createStatement or execute fails 8607f8b552d917f064b2ebfd60ffcef1e6f92bb0 tdf#82591 ORowSetBase::getRow handles insert row correctly a819691ecc32586e800566d74ac22b474430d685 another DrawingML export crash fix 1f19bc5de3e0f4eb89c4ebc3b74319ccff138ada Fix TB Linux-F19-x86_64_14-with-check 51262ef0d11d9aef246001d8a9b1c1d8753023bd Implemented formula group count statistic 71eeb8aa5897349073d0a6235a034bec26465040 ScrollFlags conversion "typo" - fixes scrolling repaint problems 6a626955eb8b803fa58a58baafaa2a06ab4761f2 Fix missing small clear formatting icon 661791da72ec2bba3552279e239f13df1c4f add a bugzilla starting id and set it for tdf a456034cb2472ebb98217be223b73f5653c9e560 VclPtr: tdf#91396 crash after tool options and sidebar switching most likely candidate is prolly: 9b06d36571bbfa2d722f36610375e7cd24be81a7 reenable JunitTest_dbaccess_complex part RowSet I want more test too.. but a 50% buildtime increase just for that one unit test :-( Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 86305, which changed state. Bug 86305 Summary: EDITING: Entering data into a cell changes array formula that references that cell https://bugs.documentfoundation.org/show_bug.cgi?id=86305 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PyUNO usability improvements
On 16/06/2015 21:45, Eike Rathke wrote: Is there a specific reason for this? Why not keep the order the API uses? My concern is, that if these get mixed the user will get confused.. Doing it the other way round would give a different obvious violation of the principle of least confusion. Taking one of my original examples, > tbl.Data = ((y for y in range(10*x,10*x + 10)) for x in range(10)) > tbl.Data ((0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), (10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0), (20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0), (30.0, 31.0, 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0), (40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0, 49.0), (50.0, 51.0, 52.0, 53.0, 54.0, 55.0, 56.0, 57.0, 58.0, 59.0), (60.0, 61.0, 62.0, 63.0, 64.0, 65.0, 66.0, 67.0, 68.0, 69.0), (70.0, 71.0, 72.0, 73.0, 74.0, 75.0, 76.0, 77.0, 78.0, 79.0), (80.0, 81.0, 82.0, 83.0, 84.0, 85.0, 86.0, 87.0, 88.0, 89.0), (90.0, 91.0, 92.0, 93.0, 94.0, 95.0, 96.0, 97.0, 98.0, 99.0)) > tbl.Data[9][0] 90.0 > tbl[9,0].Value 90.0 If the XCellRange specialisation used c,r order, the last statement would give 9, not 90 (The .Data comes from the XChartDataArray interface; there is also e.g. .DataArray from XCellRangeData) Regards Matthew Francis ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
SDK Java Spreadsheet CalcAddIns example
Hi all, I tried to build sdk/examples/java/Spreadsheet example, and build was successful - CalcAddins.oxt assembled and was installed in LO, I see it in extensions manager. But when I open CalcAddins.ods, I see #NAME? when functions from addin is called (=org.openoffice.sheet.addin.calcaddins.getmyfirstvalue(), =org.openoffice.sheet.addin.calcaddins.getmysecondvalue(E4)) so I guess that it means that no functions are loaded from the extension. I tested with current nightly build (5.1) debug, and with production LO 4.4.3.2 (libre office fresh in archlinux) with the same results. I tried to build with JDK 1.7 and 1.8, also no joy. I hoped to see some related log output in LO debug build, but I do not see any errors related to java extension. Any ideas what to do now? Does CalcAddins example work for anybody? Thanks in advance, Mike ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source sw/uiconfig
sw/source/ui/fmtui/tmpdlg.cxx | 10 +-
sw/uiconfig/swriter/ui/templatedialog2.ui | 13 +
2 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 343f992816ab594c608537fd32fb4bf412f5fabb
Author: Zolnai Tamás
Date: Wed Jun 17 00:00:27 2015 +0200
tdf#90072: No character background (highlight) tab in paragraph styles
dialog
Background Tab was replaced with Area Tab on Paragraph Style
Dialog. With that we lost the opportunity to set character background
color. So bring back the Background tab as Highlighting.
(cherry picked from commit 9874db206eed84616e4e232b1b56c7b7532166a0)
Change-Id: I29925f72816fbd27243060231d551e6590f1b9d9
Reviewed-on: https://gerrit.libreoffice.org/16324
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index f0ad083..cbb4c1d 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -187,6 +187,10 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES
) , "GetTabPageRangesFunc fail!");
m_nAsianLayoutId = AddTabPage("asianlayout",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) );
+OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ),
"GetTabPageCreatorFunc fail!");
+OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ,
"GetTabPageRangesFunc fail!");
+m_nBackgroundId = AddTabPage("highlighting",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageRangesFunc fail!");
m_nTabId = AddTabPage("tabs",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
@@ -480,13 +484,9 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId,
SfxTabPage &rPage )
else if (nId == m_nBackgroundId)
{
SvxBackgroundTabFlags nFlagType = SvxBackgroundTabFlags::NONE;
-if( SFX_STYLE_FAMILY_PARA == nType )
-nFlagType |= SvxBackgroundTabFlags::SHOW_PARACTL;
-if( SFX_STYLE_FAMILY_CHAR != nType )
-nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR;
if( SFX_STYLE_FAMILY_FRAME == nType )
nFlagType |= SvxBackgroundTabFlags::ENABLE_TRANSPARENCY;
-if( SFX_STYLE_FAMILY_CHAR == nType )
+if( SFX_STYLE_FAMILY_CHAR == nType || SFX_STYLE_FAMILY_PARA == nType )
nFlagType |= SvxBackgroundTabFlags::SHOW_HIGHLIGHTING;
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,
static_cast(nFlagType)));
rPage.PageCreated(aSet);
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 6b9f61b..017cbd3 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -249,6 +249,19 @@
+
+True
+False
+Highlighting
+
+
+False
+
+
+
+
+
+
True
False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source cui/uiconfig include/svx reportdesign/source reportdesign/uiconfig sw/source sw/uiconfig
cui/source/dialogs/srchxtra.cxx |3 +++
cui/source/inc/backgrnd.hxx |1 +
cui/source/inc/cuires.hrc |1 +
cui/source/tabpages/backgrnd.cxx|5 +
cui/source/tabpages/strings.src |4
cui/uiconfig/ui/backgroundpage.ui |2 +-
cui/uiconfig/ui/optfltrembedpage.ui |2 +-
cui/uiconfig/ui/searchformatdialog.ui |2 +-
include/svx/flagsdef.hxx|1 +
reportdesign/source/ui/dlg/dlgpage.cxx | 12 +++-
reportdesign/source/ui/inc/dlgpage.hxx |3 +++
reportdesign/uiconfig/dbreport/ui/chardialog.ui |2 +-
sw/source/ui/chrdlg/chardlg.cxx |5 +
sw/source/ui/fmtui/tmpdlg.cxx |2 ++
sw/uiconfig/swriter/ui/characterproperties.ui |2 +-
sw/uiconfig/swriter/ui/templatedialog1.ui |2 +-
16 files changed, 42 insertions(+), 7 deletions(-)
New commits:
commit 94e9ad75943c39af548fc4b094c1e67df900e8a1
Author: Zolnai Tamás
Date: Tue Jun 16 21:43:56 2015 +0200
tdf#89830: Ambiguous naming of character background
Use 'Highlighting' also on Character Dialog.
(cherry picked from commit 3588a04f438b001cb64aa1fd86b28869f2c4e70b)
Options: Background -> Highlighting
(cherry picked from commit b47151f5d1e287425511b45c5474e10eb0ba3a9d)
Search By Format: Background -> Highlighting
(cherry picked from commit 16d202f29cafbdc8d0648b830d2209f5c61c878f)
Make this string localizable
(cherry picked from commit a676ad5ec8348a6c8074e3a8d42590e8fd189cf5)
Change-Id: Ifa48799bb9e415d17f4e323008fac57270bae34b
Reviewed-on: https://gerrit.libreoffice.org/16322
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 4497601..db41952 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -114,6 +114,9 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId,
SfxTabPage& rPage )
else if (nId == m_nBackPageId)
{
static_cast(rPage).ShowParaControl(true);
+SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
+
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
+rPage.PageCreated(aSet);
}
}
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 633e4e6..c08b8a1 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -81,6 +81,7 @@ private:
VclPtrm_pTblLBox;
VclPtrm_pParaLBox;
+VclPtr m_pBackGroundColorLabelFT;
VclPtr m_pBackGroundColorFrame;
VclPtr m_pBackgroundColorSet;
VclPtr m_pPreviewWin1;
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 3214b51..87eb802 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -93,6 +93,7 @@
#define RID_SVXSTR_CHARNAME_FONT(RID_SVX_START + 241)
#define RID_SVXSTR_CHARNAME_STYLE (RID_SVX_START + 242)
#define RID_SVXSTR_CHARNAME_TYPEFACE(RID_SVX_START + 243)
+#define RID_SVXSTR_CHARNAME_HIGHLIGHTING(RID_SVX_START + 244)
// options
#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START +
1162)
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 9ba70fa..14c90e9 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -370,6 +370,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window*
pParent, const SfxItemSe
get(m_pTblLBox, "tablelb");
get(m_pParaLBox, "paralb");
+get(m_pBackGroundColorLabelFT, "background_label");
get(m_pBackGroundColorFrame, "backgroundcolorframe");
get(m_pBackgroundColorSet, "backgroundcolorset");
get(m_pPreviewWin1, "preview1");
@@ -1785,6 +1786,10 @@ void SvxBackgroundTabPage::PageCreated(const
SfxAllItemSet& aSet)
ShowSelector();
if ( nFlags & SvxBackgroundTabFlags::ENABLE_TRANSPARENCY )
EnableTransparency(true, true);
+if ( nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING )
+{
+
m_pBackGroundColorLabelFT->SetText(CUI_RES(RID_SVXSTR_CHARNAME_HIGHLIGHTING));
+}
}
}
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index da547d4..e380d5a 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -103,6 +103,10 @@ String RID_SVXSTR_CHARNAME_TYPEFACE
{
Text [ en-US ] = "Typeface";
};
+String RID_SVXSTR_CHARNAME_HIGHLIGHTING
+{
+Text [ en-US ] = "Highlighting Color";
+};
String RID_SVXSTR_USE_REPLACE
{
Text [ en-US ] = "Use replacement table" ;
diff --git a/cui/uiconfig/ui/backgroundpage.ui
b/cui/uiconfig/ui/ba
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/inc sc/source
sc/inc/token.hxx |6 ++
sc/source/core/tool/token.cxx | 19 ++-
2 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit ab6be8b2b01f9657f105d5ec9b027c9fa99d4325
Author: Eike Rathke
Date: Wed Jun 17 00:04:30 2015 +0200
Resolves: tdf#86305 clone upper left of matrix result if double token
Change-Id: I541577e0b99b0144a755e5755adc890c0ca8d204
(cherry picked from commit ffc1ffed11dc63a69fc2db04f12b3ea266b580fe)
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 4662074..63584c7 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -381,6 +381,12 @@ public:
/** Reset matrix and upper left, keep matrix
formula dimension. */
void ResetResult();
+
+private:
+
+/** xUpperLeft is modifiable through SetUpperLeftDouble(), so clone it
+whenever an svDouble token is assigned to. */
+void CloneUpperLeftIfNecessary();
};
class SC_DLLPUBLIC ScHybridCellToken : public formula::FormulaToken
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f9e0cc0..00f1d45 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1022,7 +1022,10 @@ void ScMatrixCellResultToken::Assign( const
ScMatrixCellResultToken & r )
ScMatrixFormulaCellToken::ScMatrixFormulaCellToken(
SCCOL nC, SCROW nR, const ScConstMatrixRef& pMat, formula::FormulaToken*
pUL ) :
-ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC) {}
+ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC)
+{
+CloneUpperLeftIfNecessary();
+}
ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( SCCOL nC, SCROW nR ) :
ScMatrixCellResultToken(NULL, NULL), nRows(nR), nCols(nC) {}
@@ -1030,10 +1033,7 @@ ScMatrixFormulaCellToken::ScMatrixFormulaCellToken(
SCCOL nC, SCROW nR ) :
ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( const
ScMatrixFormulaCellToken& r ) :
ScMatrixCellResultToken(r), nRows(r.nRows), nCols(r.nCols)
{
-// xUpperLeft is modifiable through
-// SetUpperLeftDouble(), so clone it.
-if (xUpperLeft)
-xUpperLeft = xUpperLeft->Clone();
+CloneUpperLeftIfNecessary();
}
ScMatrixFormulaCellToken::~ScMatrixFormulaCellToken() {}
@@ -1045,9 +1045,17 @@ bool ScMatrixFormulaCellToken::operator==( const
FormulaToken& r ) const
nCols == p->nCols && nRows == p->nRows;
}
+void ScMatrixFormulaCellToken::CloneUpperLeftIfNecessary()
+{
+if (xUpperLeft && xUpperLeft->GetType() == svDouble)
+xUpperLeft = xUpperLeft->Clone();
+}
+
void ScMatrixFormulaCellToken::Assign( const ScMatrixCellResultToken & r )
{
ScMatrixCellResultToken::Assign( r);
+
+CloneUpperLeftIfNecessary();
}
void ScMatrixFormulaCellToken::Assign( const formula::FormulaToken& r )
@@ -1069,6 +1077,7 @@ void ScMatrixFormulaCellToken::Assign( const
formula::FormulaToken& r )
{
xUpperLeft = &r;
xMatrix = NULL;
+CloneUpperLeftIfNecessary();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] UI changes for LO-5.0 - review needed
> I would need review from the UX side. +1 from UX :-) Adolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/editeng svx/source
include/editeng/overflowingtxt.hxx |1 +
svx/source/svdraw/svdotextdecomposition.cxx |3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fe00f635ab95ddb7050f847b13e65b6d25bf60a3
Author: matteocam
Date: Tue Jun 16 18:25:37 2015 -0400
Checking whether to reuse heading text
Change-Id: I0af344132bf577a0e159b871beec961f6a19
diff --git a/include/editeng/overflowingtxt.hxx
b/include/editeng/overflowingtxt.hxx
index baec920..e4f9a2d 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -50,6 +50,7 @@ public:
OUString GetHeadingLines() const;
OUString GetEndingLines() const;
+bool HasOtherParas() const { return !(mTailTxt == "" && mpMidParas ==
NULL); }
};
class EDITENG_DLLPUBLIC NonOverflowingText {
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index b5f70fc..cd3e2c7 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -833,7 +833,8 @@ OutlinerParaObject
*SdrTextObj::impGetOverflowingParaObject(SdrOutliner *pOutlin
// Set headText at the beginning of box
OUString aHeadTxt = mpOverflowingText->GetHeadingLines();
-if (aHeadTxt != "") {
+// If we haven't used heading text yet
+if (mpOverflowingText->HasOtherParas()) {
Paragraph *pNewPara0 = pOutliner->GetParagraph(0);
pOutliner->SetText(aHeadTxt, pNewPara0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
UI changes for LO-5.0 - review needed
Hi guys, I submit two patches to gerrit related to text highlighting: First one renames all instances of character "Background" to "Highlighting": https://gerrit.libreoffice.org/#/c/16322/ Second one adds a Highlighting Tab to paragraph styles dialog, because in the LO-4.4 release we lost the functionality of setting character background for paragraph styles: https://gerrit.libreoffice.org/#/c/16324/ I would need review from the UX side. I hope it can get into the 5.0 branch before the UI freeze. Thanks, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/token.hxx |6 ++
sc/source/core/tool/token.cxx | 19 ++-
2 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit ffc1ffed11dc63a69fc2db04f12b3ea266b580fe
Author: Eike Rathke
Date: Wed Jun 17 00:04:30 2015 +0200
Resolves: tdf#86305 clone upper left of matrix result if double token
Change-Id: I541577e0b99b0144a755e5755adc890c0ca8d204
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 4662074..63584c7 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -381,6 +381,12 @@ public:
/** Reset matrix and upper left, keep matrix
formula dimension. */
void ResetResult();
+
+private:
+
+/** xUpperLeft is modifiable through SetUpperLeftDouble(), so clone it
+whenever an svDouble token is assigned to. */
+void CloneUpperLeftIfNecessary();
};
class SC_DLLPUBLIC ScHybridCellToken : public formula::FormulaToken
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 71bc28c..5561423 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1022,7 +1022,10 @@ void ScMatrixCellResultToken::Assign( const
ScMatrixCellResultToken & r )
ScMatrixFormulaCellToken::ScMatrixFormulaCellToken(
SCCOL nC, SCROW nR, const ScConstMatrixRef& pMat, formula::FormulaToken*
pUL ) :
-ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC) {}
+ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC)
+{
+CloneUpperLeftIfNecessary();
+}
ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( SCCOL nC, SCROW nR ) :
ScMatrixCellResultToken(NULL, NULL), nRows(nR), nCols(nC) {}
@@ -1030,10 +1033,7 @@ ScMatrixFormulaCellToken::ScMatrixFormulaCellToken(
SCCOL nC, SCROW nR ) :
ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( const
ScMatrixFormulaCellToken& r ) :
ScMatrixCellResultToken(r), nRows(r.nRows), nCols(r.nCols)
{
-// xUpperLeft is modifiable through
-// SetUpperLeftDouble(), so clone it.
-if (xUpperLeft)
-xUpperLeft = xUpperLeft->Clone();
+CloneUpperLeftIfNecessary();
}
ScMatrixFormulaCellToken::~ScMatrixFormulaCellToken() {}
@@ -1045,9 +1045,17 @@ bool ScMatrixFormulaCellToken::operator==( const
FormulaToken& r ) const
nCols == p->nCols && nRows == p->nRows;
}
+void ScMatrixFormulaCellToken::CloneUpperLeftIfNecessary()
+{
+if (xUpperLeft && xUpperLeft->GetType() == svDouble)
+xUpperLeft = xUpperLeft->Clone();
+}
+
void ScMatrixFormulaCellToken::Assign( const ScMatrixCellResultToken & r )
{
ScMatrixCellResultToken::Assign( r);
+
+CloneUpperLeftIfNecessary();
}
void ScMatrixFormulaCellToken::Assign( const formula::FormulaToken& r )
@@ -1069,6 +1077,7 @@ void ScMatrixFormulaCellToken::Assign( const
formula::FormulaToken& r )
{
xUpperLeft = &r;
xMatrix = NULL;
+CloneUpperLeftIfNecessary();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/fmtui/tmpdlg.cxx |8 +---
sw/uiconfig/swriter/ui/templatedialog2.ui | 13 +
2 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 9874db206eed84616e4e232b1b56c7b7532166a0
Author: Zolnai Tamás
Date: Tue Jun 16 22:22:42 2015 +0200
tdf#90072: No character background (highlight) tab in paragraph styles
dialog
Background Tab was replaced with Area Tab on Paragraph Style
Dialog. With that we lost the opportunity to set character background
color. So bring back the Background tab as Highlighting.
Change-Id: I29925f72816fbd27243060231d551e6590f1b9d9
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index e29858a..738eee2 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -187,6 +187,10 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES
) , "GetTabPageRangesFunc fail!");
m_nAsianLayoutId = AddTabPage("asianlayout",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) );
+OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ),
"GetTabPageCreatorFunc fail!");
+OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ,
"GetTabPageRangesFunc fail!");
+m_nBackgroundId = AddTabPage("highlighting",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageRangesFunc fail!");
m_nTabId = AddTabPage("tabs",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
@@ -467,9 +471,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage
&rPage )
else if (nId == m_nBackgroundId)
{
SvxBackgroundTabFlags nFlagType = SvxBackgroundTabFlags::NONE;
-if( SFX_STYLE_FAMILY_CHAR != nType )
-nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR;
-if( SFX_STYLE_FAMILY_CHAR == nType )
+if( SFX_STYLE_FAMILY_CHAR == nType || SFX_STYLE_FAMILY_PARA == nType )
nFlagType |= SvxBackgroundTabFlags::SHOW_HIGHLIGHTING;
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,
static_cast(nFlagType)));
rPage.PageCreated(aSet);
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 6b9f61b..017cbd3 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -249,6 +249,19 @@
+
+True
+False
+Highlighting
+
+
+False
+
+
+
+
+
+
True
False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: test infrastructure ideas appreciated ... -- automatically generated unit tests
2015-06-16 9:15 GMT+02:00 Stephan Bergmann : > On 06/15/2015 03:51 PM, Zolnai Tamás wrote: >> >> I've got an idea too: automatically generated unit tests. >> I think with a clang plugin we can generate unit tests for all >> class/struct in the source code in build time. Build system can link >> it as a simple unit test and run it directly after generation. If it >> returns with no error it can be removed. If it returns an error the >> test should be untouched to allow running it directly (without >> regeneration). >> >> These kind of tests gets in my mind now: >> - Create an object and remove it (check no problem with destruction) >> - Create and remove an object thousand of times (memory leak) >> - Copy operator and copy constructor result is equivalent (operator== is >> needed) >> - Copy an object, remove the original object (shallow copy) >> - Create a const object, call all const method on it and check it remains >> equal. >> - Getter and setter method: set a value and check the corresponding >> getter method returns with the same value >> -- Set values depending on the parameter type >> --- int: end points of the value range, negative value, 0, positive value >> --- string: empty string, dummy string, string with wild characters. > > > I'm not sure how exciting an approach that is. Especially for the later > part of your list, it builds on the assumption that an object is merely a > conglomeration of public member functions, that can be called in arbitrary > sequence and with arbitrary arguments, and that is often just not the case. > The dreaded JunitTest_*_unoapi are modeled somewhat like that. Yeap, that's right. There are cases when they are not arbitrary, but when that's the case I think it's always a good idea to add assertions (or warnings or comments or anything) to the code to make assumptions explicit about the arguments or order of the member functions. The unit test generator should use these information. Best Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: test infrastructure ideas appreciated ... -- automatically generated unit tests
2015-06-15 21:34 GMT+02:00 Michael Meeks : > Hi Tamas, > > On Mon, 2015-06-15 at 15:51 +0200, Zolnai Tamás wrote: >> I've got an idea too: automatically generated unit tests. > > Sounds interesting :-) are there some existing examples of clang > plugins that do this - or some papers / existing code that does this ? I > imagine we would want annotations in the code to help the unit-tester, > and also (I guess) support methods that create working helpful objects > to pass into constructors like documents, shells, filters etc. ;-) > > Added to the list for discussion; it'd be great to hear from you in > the > ESC call on Thursday if you can make it on this topic. Then again - it's > less than clear to me (given the bulk of suggestions) how we'll > prioritize them to build a recommendation for a tender to do this =) Hi Michael, I didn't find any example code in this topic. It was just a sudden idea deducted from the general rule: If you are bored doing things manually do it automatically. :) I'm not sure what clang plugins capable of. There are more experienced guys in this territory. Best Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng svx/source
editeng/source/outliner/overflowingtxt.cxx |5 +
include/editeng/overflowingtxt.hxx |1 +
svx/source/svdraw/svdotextdecomposition.cxx |7 +--
svx/source/svdraw/textchain.cxx |3 ++-
4 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 2565e304894e0b0e85a82cd858f0b78a72748b04
Author: matteocam
Date: Tue Jun 16 16:58:21 2015 -0400
Uses GetHeadingLines() to check before introducing the same text twice
Change-Id: Iddb38eb05a7848adb8890003a2af95ffc4b1778d
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index f591dac..99b2250 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -33,5 +33,10 @@ OUString OverflowingText::GetEndingLines() const
return mTailTxt;
}
+OUString OverflowingText::GetHeadingLines() const
+{
+return mHeadTxt;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/overflowingtxt.hxx
b/include/editeng/overflowingtxt.hxx
index 40eaa28..baec920 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -48,6 +48,7 @@ public:
mTailTxt(tailTxt)
{ }
+OUString GetHeadingLines() const;
OUString GetEndingLines() const;
};
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 6d1a0c4..b5f70fc 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -832,8 +832,11 @@ OutlinerParaObject
*SdrTextObj::impGetOverflowingParaObject(SdrOutliner *pOutlin
impSetOutlinerToEmptyTxt(pOutliner);
// Set headText at the beginning of box
-Paragraph *pNewPara0 = pOutliner->GetParagraph(0);
-pOutliner->SetText(mpOverflowingText->mHeadTxt, pNewPara0);
+OUString aHeadTxt = mpOverflowingText->GetHeadingLines();
+if (aHeadTxt != "") {
+Paragraph *pNewPara0 = pOutliner->GetParagraph(0);
+pOutliner->SetText(aHeadTxt, pNewPara0);
+}
// Set all the intermediate Paras
if (mpOverflowingText->mpMidParas)
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 28daf86..a4495b0 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -35,6 +35,7 @@ SdrTextObj *TextChain::GetNextLink(SdrTextObj *)
bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj *pPrevLink,
SdrTextObj *pNextLink)
{
-
+// XXX
+return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
editeng/source/outliner/overflowingtxt.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 5e4e1e32407b40d526e54e58c69256a7d740ced2
Author: matteocam
Date: Tue Jun 16 16:39:41 2015 -0400
Fixed GetEndingLines()
Change-Id: I41adadae9b5ff4d9f3221b48fd939202ef93f9bb
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index d5fa910..f591dac 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -25,8 +25,9 @@
OUString OverflowingText::GetEndingLines() const
{
-// Only some lines in the same para overflowing, thus the head gives the
ending lines
-if (mHeadTxt == "" && mpMidParas == NULL)
+// If the only overflowing part is some lines in a paragraph,
+// the end of the overflowing text is its head.
+if (mTailTxt == "" && mpMidParas == NULL)
return mHeadTxt;
return mTailTxt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/editeng svx/source
include/editeng/overflowingtxt.hxx | 10 +++---
svx/source/svdraw/svdotextdecomposition.cxx |2 --
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 17f19d1cca035256176fd0315155a5d4cf27516e
Author: matteocam
Date: Tue Jun 16 16:30:08 2015 -0400
Exports (Non)OverflowingText classes
Change-Id: I2a4b17e4d08d830cb413fef77af59ed9c031fb1f
diff --git a/include/editeng/overflowingtxt.hxx
b/include/editeng/overflowingtxt.hxx
index ef1cfc8..40eaa28 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
#define INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
+#include
+#include
class OUString;
@@ -27,8 +29,10 @@ class OUString;
class OutlinerParaObject;
-class OverflowingText {
-public:
+class EDITENG_DLLPUBLIC OverflowingText
+{
+
+public:
OUString mHeadTxt;
const OutlinerParaObject *mpMidParas;
OUString mTailTxt;
@@ -47,7 +51,7 @@ class OverflowingText {
OUString GetEndingLines() const;
};
-class NonOverflowingText {
+class EDITENG_DLLPUBLIC NonOverflowingText {
public:
const OutlinerParaObject *mpHeadParas;
OUString mPreOverflowingTxt;
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 1a56f94..6d1a0c4 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1628,8 +1628,6 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
/* Begin overflow handling */
-TextChain *aTxtChain = new TextChain;
-
// If overflow occurs we have to cut the text at the right point
// If in edit mode ImpEditEngine should have taken care of this
if ( rOutliner.IsPageOverflow() && !IsInEditMode()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 81806, which changed state. Bug 81806 Summary: EDITING: Document corruption and crash when editing tables https://bugs.documentfoundation.org/show_bug.cgi?id=81806 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
sw/source/core/frmedt/fecopy.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 5fbf5b10ca45528a075aba5d5f8e3f6af08c287f
Author: Caolán McNamara
Date: Tue Jun 16 19:57:15 2015 +0100
Resolves: tdf#81806 crash on certain table paste+undo+page cycles
Undo of a delete always leaves a pam that points to the start of the undone
area and a mark to the end of the undone area, even if that area is empty.
(In
the normal where there is a selection this can be seen by selecting
something,
deleting it, and undoing and the newly undeleted stuff is again selected)
The table overwrite/paste thing looks to see if a mark is set and goes off
to
"do something very complex" if its set. So if after each undo cycle, you
physically click at the point where the cursor is flashing (which clears the
mark) and then paste, undo, *click*, paste you get a wonderfully stable
experience.
It seems reasonable to me to "do the simple thing" if there is no mark, or
if
the mark and point are the same, i.e. there is nothing actually selected by
the
PaM.
Change-Id: Ib451090f3863fde41209cc1fc9cfa0c747d0be58
(cherry picked from commit e06905df15ff03c6d3c84f61bd67860a91416c2d)
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index ef1a64a..987625d 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -667,6 +667,11 @@ namespace {
typedef boost::shared_ptr PaMPtr;
typedef boost::shared_ptr PositionPtr;
typedef std::pair< PaMPtr, PositionPtr > Insertion;
+
+bool PamHasSelection(const SwPaM& rPaM)
+{
+return rPaM.HasMark() && *rPaM.GetPoint() != *rPaM.GetMark();
+}
}
bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
@@ -839,7 +844,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool
bIncludingPageFrames )
ParkTableCrsr();
bParkTableCrsr = true;
}
-else if( !rPaM.HasMark() && rPaM.GetNext() == &rPaM &&
+else if( !PamHasSelection(rPaM) && rPaM.GetNext() == &rPaM &&
( !pSrcNd->GetTable().IsTableComplex() ||
pDestNd->GetTable().IsNewModel() ) )
{
___
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/core/frmedt/fecopy.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit e06905df15ff03c6d3c84f61bd67860a91416c2d
Author: Caolán McNamara
Date: Tue Jun 16 19:57:15 2015 +0100
Resolves: tdf#81806 crash on certain table paste+undo+page cycles
Undo of a delete always leaves a pam that points to the start of the undone
area and a mark to the end of the undone area, even if that area is empty.
(In
the normal where there is a selection this can be seen by selecting
something,
deleting it, and undoing and the newly undeleted stuff is again selected)
The table overwrite/paste thing looks to see if a mark is set and goes off
to
"do something very complex" if its set. So if after each undo cycle, you
physically click at the point where the cursor is flashing (which clears the
mark) and then paste, undo, *click*, paste you get a wonderfully stable
experience.
It seems reasonable to me to "do the simple thing" if there is no mark, or
if
the mark and point are the same, i.e. there is nothing actually selected by
the
PaM.
Change-Id: Ib451090f3863fde41209cc1fc9cfa0c747d0be58
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 612f631..d6dac44 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -667,6 +667,11 @@ namespace {
typedef boost::shared_ptr PaMPtr;
typedef boost::shared_ptr PositionPtr;
typedef std::pair< PaMPtr, PositionPtr > Insertion;
+
+bool PamHasSelection(const SwPaM& rPaM)
+{
+return rPaM.HasMark() && *rPaM.GetPoint() != *rPaM.GetMark();
+}
}
bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
@@ -839,7 +844,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool
bIncludingPageFrames )
ParkTableCrsr();
bParkTableCrsr = true;
}
-else if( !rPaM.HasMark() && rPaM.GetNext() == &rPaM &&
+else if( !PamHasSelection(rPaM) && rPaM.GetNext() == &rPaM &&
( !pSrcNd->GetTable().IsTableComplex() ||
pDestNd->GetTable().IsNewModel() ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng
editeng/source/outliner/overflowingtxt.cxx |2 --
include/editeng/overflowingtxt.hxx |6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit fe51929b1c4cc8e4b28c88d056addf560636176d
Author: matteocam
Date: Tue Jun 16 13:52:50 2015 -0400
Fixed namespace line
Change-Id: Ic2421db661e4cba6a8c589355349ebca922beb84
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index 2661c41..d5fa910 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -22,8 +22,6 @@
#include
-using namespace ::rtl;
-
OUString OverflowingText::GetEndingLines() const
{
diff --git a/include/editeng/overflowingtxt.hxx
b/include/editeng/overflowingtxt.hxx
index a921b2c..ef1cfc8 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
#define INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
-namespace rtl {
-class OUString;
-}
+
+class OUString;
+
class OutlinerParaObject;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
editeng/source/outliner/overflowingtxt.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 19014e70ab1ea433594e32899eca15dff79724b0
Author: matteocam
Date: Tue Jun 16 13:42:21 2015 -0400
GetEndingLines should return head if everything is empty
Change-Id: I4921c7a337f1cfe0a5b48d49492ddde9117332d1
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index 0f02900..2661c41 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -27,11 +27,11 @@ using namespace ::rtl;
OUString OverflowingText::GetEndingLines() const
{
-// Only some lines in the same para overflowing
+// Only some lines in the same para overflowing, thus the head gives the
ending lines
if (mHeadTxt == "" && mpMidParas == NULL)
-return mTailTxt;
+return mHeadTxt;
-return mHeadTxt;
+return mTailTxt;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/Library_editeng.mk editeng/source include/editeng svx/source
editeng/Library_editeng.mk |1
editeng/source/outliner/overflowingtxt.cxx | 38
include/editeng/overflowingtxt.hxx |7 -
svx/source/svdraw/svdotextdecomposition.cxx |2 -
svx/source/svdraw/textchain.cxx |1
5 files changed, 47 insertions(+), 2 deletions(-)
New commits:
commit 5d9277e7b55b7eef512113c63f7c852b583dd282
Author: matteocam
Date: Tue Jun 16 13:34:57 2015 -0400
Added overflowingtxt.cxx; merges lines properly in more cases
Change-Id: Ibffd65bb53bef7a1fbab87dff93764c4ee1feb3e
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 9ffed0a..0d0be08 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\
editeng/source/outliner/outlundo \
editeng/source/outliner/outlvw \
editeng/source/outliner/paralist \
+editeng/source/outliner/overflowingtxt \
editeng/source/rtf/rtfitem \
editeng/source/rtf/svxrtf \
editeng/source/uno/unoedhlp \
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
new file mode 100644
index 000..0f02900
--- /dev/null
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include
+#include
+
+#include
+
+using namespace ::rtl;
+
+
+OUString OverflowingText::GetEndingLines() const
+{
+// Only some lines in the same para overflowing
+if (mHeadTxt == "" && mpMidParas == NULL)
+return mTailTxt;
+
+return mHeadTxt;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/overflowingtxt.hxx
b/include/editeng/overflowingtxt.hxx
index 973729f..a921b2c 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -20,7 +20,10 @@
#ifndef INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
#define INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
-class OUString;
+namespace rtl {
+class OUString;
+}
+
class OutlinerParaObject;
@@ -40,6 +43,8 @@ class OverflowingText {
mpMidParas(pMidParas),
mTailTxt(tailTxt)
{ }
+
+OUString GetEndingLines() const;
};
class NonOverflowingText {
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index a0d6823..1a56f94 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -823,7 +823,7 @@ OutlinerParaObject
*SdrTextObj::impGetOverflowingParaObject(SdrOutliner *pOutlin
impSetOutlinerToEmptyTxt(pOutliner);
pTmpPara0 = pOutliner->GetParagraph(0);
-pOutliner->SetText(mpOverflowingText->mTailTxt + aOldPara0Txt,
pTmpPara0);
+pOutliner->SetText(mpOverflowingText->GetEndingLines() + aOldPara0Txt,
pTmpPara0);
pJoiningPara = pOutliner->CreateParaObject();
}
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 17595c9..28daf86 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -37,3 +37,4 @@ bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj
*pPrevLink, SdrTextObj
{
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source
include/svx/svdmodel.hxx|5 +
include/svx/svdotext.hxx|1 +
include/svx/textchain.hxx |3 +++
svx/source/svdraw/svdmodel.cxx | 14 ++
svx/source/svdraw/svdotext.cxx |8
svx/source/svdraw/textchain.cxx |5 +
6 files changed, 36 insertions(+)
New commits:
commit dde308668425a5849d49e3ac5040e2157141cc6c
Author: matteocam
Date: Tue Jun 16 12:35:28 2015 -0400
Changed SdrModel and SdrTextObj to use TextChain
Change-Id: I3e2e4cbe861f48366e3ab0abbe83c97e0aafe69b
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index bdc992d..c7f7233 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -75,6 +75,8 @@ class SotStorage;
class SdrOutlinerCache;
class SdrUndoFactory;
class ImageMap;
+class TextChain;
+
namespace comphelper
{
class IEmbeddedHelper;
@@ -211,6 +213,8 @@ protected:
sal_uInt16 nDefaultTabulator;
sal_uInt32 nMaxUndoCount;
+TextChain* pTextChain;
+
// sdr::Comment interface
@@ -328,6 +332,7 @@ public:
SdrOutliner& GetDrawOutliner(const SdrTextObj* pObj=NULL) const;
SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=NULL)
const;
+TextChain *GetTextChain() const;
SdrOutliner& GetHitTestOutliner() const { return
*pHitTestOutliner; }
const SdrTextObj*GetFormattingTextObj() const;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 83b488e..bbc9207 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -361,6 +361,7 @@ public:
bool IsChainable() const { return GetNextLinkInChain() != NULL; }
void SetPreventChainable();
bool GetPreventChainable() const;
+TextChain *GetTextChain() const;
SdrObjKind GetTextKind() const { return eTextKind; }
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index e094334..42dc999 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -29,6 +29,9 @@ class TextChain {
void AppendLink(SdrTextObj *);
SdrTextObj *GetNextLink(SdrTextObj *);
+// return whether a paragraph is split between the two links in the
argument
+bool GetLinksHaveMergeableFirstPara(SdrTextObj *pPrevLink, SdrTextObj
*pNextLink);
+
};
#endif // INCLUDED_SVX_TEXTCHAIN_HXX
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ce0ff7a..19652f4 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -212,9 +213,17 @@ void SdrModel::ImpCtor(SfxItemPool* pPool,
::comphelper::IEmbeddedHelper* _pEmbe
pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
ImpSetOutlinerDefaults(pHitTestOutliner, true);
+// FIXME(matteocam)
+/* Start Text Chaining related code */
+
+// Initialize Chaining Outliner
pChainingOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
ImpSetOutlinerDefaults(pChainingOutliner, true);
+// Make a TextChain
+pTextChain = new TextChain;
+
+/* End Text Chaining related code */
ImpCreateTables();
}
@@ -1977,6 +1986,11 @@ void SdrModel::PageListChanged()
{
}
+TextChain *SdrModel::GetTextChain() const
+{
+return pTextChain;
+}
+
const SdrPage* SdrModel::GetMasterPage(sal_uInt16 nPgNum) const
{
DBG_ASSERT(nPgNum < maMaPag.size(), "SdrModel::GetMasterPage: Access out
of range (!)");
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 03b8388..cc17892 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1543,6 +1543,14 @@ void SdrTextObj::SetToBeChained(bool bToBeChained)
mbToBeChained = bToBeChained;
}
+TextChain *SdrTextObj::GetTextChain() const
+{
+if (!IsChainable())
+return NULL;
+
+return pModel->GetTextChain();
+}
+
void SdrTextObj::SetVerticalWriting(bool bVertical)
{
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 194d4d4..17595c9 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -32,3 +32,8 @@ SdrTextObj *TextChain::GetNextLink(SdrTextObj *)
{
return NULL; // XXX
}
+
+bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj *pPrevLink,
SdrTextObj *pNextLink)
+{
+
+}
___
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/ucalc.hxx |2 +
sc/qa/unit/ucalc_sharedformula.cxx | 44 +
2 files changed, 46 insertions(+)
New commits:
commit 2d4a931208acd0060bfaa00a9444e6e0ceb7e83c
Author: Eike Rathke
Date: Tue Jun 16 17:48:27 2015 +0200
unit test for tdf#91411
Change-Id: I963674ad6c6a4ca95f1a65041f7ced64d7d86a43
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index afc4d0a..0c3e57a 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -337,6 +337,7 @@ public:
void testSharedFormulaUpdateOnDBChange();
void testSharedFormulaAbsCellListener();
void testSharedFormulaUnshareAreaListeners();
+void testSharedFormulaListenerDeleteArea();
void testFormulaPosition();
void testMixData();
@@ -586,6 +587,7 @@ public:
CPPUNIT_TEST(testSharedFormulaUpdateOnDBChange);
CPPUNIT_TEST(testSharedFormulaAbsCellListener);
CPPUNIT_TEST(testSharedFormulaUnshareAreaListeners);
+CPPUNIT_TEST(testSharedFormulaListenerDeleteArea);
CPPUNIT_TEST(testFormulaPosition);
CPPUNIT_TEST(testMixData);
CPPUNIT_TEST(testJumpToPrecedentsDependents);
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index 719b27c..c0772f1 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1733,4 +1733,48 @@ void Test::testSharedFormulaUnshareAreaListeners()
m_pDoc->DeleteTab(0);
}
+void Test::testSharedFormulaListenerDeleteArea()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
+
+m_pDoc->InsertTab(0, "Test0");
+m_pDoc->InsertTab(1, "Test1");
+
+const char* pData0[][3] = {
+{ "", "", "=Test1.C1" },
+{ "", "", "=Test1.C2" }
+};
+const char* pData1[][3] = {
+{ "=Test0.A1", "=Test0.B1", "=SUM(A1:B1)" },
+{ "=Test0.A2", "=Test0.B2", "=SUM(A2:B2)" },
+};
+
+insertRangeData(m_pDoc, ScAddress(0,0,0), pData0, SAL_N_ELEMENTS(pData0));
+insertRangeData(m_pDoc, ScAddress(0,0,1), pData1, SAL_N_ELEMENTS(pData1));
+
+// Check that Test1.A1:A2 and Test1.B1:B2 are formula groups.
+const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(0,0,1));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pFC->GetSharedLength());
+
+pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,1));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pFC->GetSharedLength());
+
+m_pDoc->SetValue(ScAddress(0,1,0), 1.0); // change value of Test0.A2
+m_pDoc->SetValue(ScAddress(1,1,0), 2.0); // change value of Test0.B2
+// Test0.C2 should be recalculated.
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(ScAddress(2,1,0)));
+
+// Delete Test0.B2
+clearRange(m_pDoc, ScRange(1,1,0));
+// Test0.C2 should be recalculated.
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(2,1,0)));
+
+m_pDoc->DeleteTab(1);
+m_pDoc->DeleteTab(0);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx
include/svx/svdotext.hxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 94cf197e6d786e6e2b9a17221b7a2faa0e5f9e4d
Author: matteocam
Date: Tue Jun 16 12:03:51 2015 -0400
TextChain is friend of SdrTextObj
Change-Id: I866fe10993296670bcca3883cf1ea5492f2ae5c9
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 9fd6262..83b488e 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -44,6 +44,7 @@ class SdrTextObj;
class SvxFieldItem;
class ImpSdrObjTextLink;
class EditStatus;
+class TextChain;
namespace sdr { namespace properties {
class TextProperties;
@@ -135,6 +136,8 @@ private:
friend classsdr::table::SdrTableRtfExporter;
friend classsdr::table::SdrTableRTFParser;
+friend classTextChain;
+
// CustomShapeproperties need to access the "bTextFrame" member:
friend class sdr::properties::CustomShapeProperties;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/export-tests.cxx | 65
1 file changed, 31 insertions(+), 34 deletions(-)
New commits:
commit a6c07d2c263a39c829385d17cc125bd7d2b01531
Author: Katarina Behrens
Date: Tue Jun 16 12:20:47 2015 +0200
Use template function to reduce copy'n'pasta code
Change-Id: I22964bfcfb80a3e97903674dbf71a1b7be3a0920
Reviewed-on: https://gerrit.libreoffice.org/16308
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 3151afb..3f52898 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -71,6 +71,25 @@
#include
#include
+CPPUNIT_NS_BEGIN
+
+template<> struct assertion_traits
+{
+static bool equal( const Color& c1, const Color& c2 )
+{
+return c1 == c2;
+}
+
+static std::string toString( const Color& c )
+{
+OStringStream ost;
+ost << static_cast(c.GetColor());
+return ost.str();
+}
+};
+
+CPPUNIT_NS_END
+
using namespace ::com::sun::star;
class SdExportTest : public SdModelTestBase
@@ -171,8 +190,8 @@ void SdExportTest::testN821567()
namespace {
-void checkFontAttributes(const SdrTextObj* pObj, sal_uInt32 nColor,
-bool bCheckWeight, FontWeight eWeight, bool bCheckItalic, FontItalic
eItalic)
+template< typename ItemValue, typename ItemType >
+void checkFontAttributes( const SdrTextObj* pObj, ItemValue nVal)
{
CPPUNIT_ASSERT_MESSAGE( "no object", pObj != NULL);
const EditTextObject& aEdit =
pObj->GetOutlinerParaObject()->GetTextObject();
@@ -180,31 +199,12 @@ void checkFontAttributes(const SdrTextObj* pObj,
sal_uInt32 nColor,
aEdit.GetCharAttribs(0, rLst);
for( std::vector::reverse_iterator it = rLst.rbegin();
it!=rLst.rend(); ++it)
{
-const SvxColorItem *pCharColor = dynamic_cast((*it).pAttr);
-if( pCharColor )
+const ItemType* pAttrib = dynamic_cast((*it).pAttr);
+if (pAttrib)
{
-CPPUNIT_ASSERT_EQUAL( nColor, pCharColor->GetValue().GetColor());
-}
-
-if(bCheckWeight)
-{
-const SvxWeightItem *pWeight = dynamic_cast((*it).pAttr);
-if( pWeight )
-{
-CPPUNIT_ASSERT_EQUAL( eWeight, pWeight->GetWeight());
-}
-}
-
-if(bCheckItalic)
-{
-const SvxPostureItem *pPosture = dynamic_cast((*it).pAttr);
-if( pPosture )
-{
-CPPUNIT_ASSERT_EQUAL( eItalic, pPosture->GetPosture());
-}
+CPPUNIT_ASSERT_EQUAL( nVal, (ItemValue)pAttrib->GetValue());
}
}
-
}
}
@@ -224,15 +224,15 @@ void SdExportTest::testBnc870233_1()
// First shape has red, bold font
{
const SdrTextObj *pObj = dynamic_cast( pPage->GetObj( 0
) );
-checkFontAttributes(pObj, sal_uInt32(0xff),
-true, WEIGHT_BOLD, true, ITALIC_NONE);
+checkFontAttributes( pObj, Color(0xff) );
+checkFontAttributes( pObj, WEIGHT_BOLD );
}
// Second shape has blue, italic font
{
const SdrTextObj *pObj = dynamic_cast( pPage->GetObj( 1
) );
-checkFontAttributes(pObj, sal_uInt32(0xff),
-true, WEIGHT_NORMAL, true, ITALIC_NORMAL);
+checkFontAttributes( pObj, Color(0xff) );
+checkFontAttributes( pObj, ITALIC_NORMAL );
}
xDocShRef->DoClose();
@@ -253,22 +253,19 @@ void SdExportTest::testBnc870233_2()
// First smart art has blue font color (direct formatting)
{
const SdrTextObj *pObj = dynamic_cast( pPage->GetObj( 0
) );
-checkFontAttributes(pObj, sal_uInt32(0xff),
-false, WEIGHT_DONTKNOW, false, ITALIC_NONE);
+checkFontAttributes( pObj, Color(0xff) );
}
// Second smart art has "dk2" font color (style)
{
const SdrTextObj *pObj = dynamic_cast( pPage->GetObj( 1
) );
-checkFontAttributes(pObj, sal_uInt32(0x1F497D),
-false, WEIGHT_DONTKNOW, false, ITALIC_NONE);
+checkFontAttributes( pObj, Color(0x1F497D) );
}
// Third smart art has white font color (style)
{
const SdrTextObj *pObj = dynamic_cast( pPage->GetObj( 2
) );
-checkFontAttributes(pObj, sal_uInt32(0xff),
-false, WEIGHT_DONTKNOW, false, ITALIC_NONE);
+checkFontAttributes( pObj, Color(0xff) );
}
xDocShRef->DoClose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 +++ 1 file changed, 3 insertions(+) New commits: commit d5a0cb563bdc538a60938ea421183e4b67c0656f Author: Yousuf Philips Date: Sat May 30 21:00:39 2015 +0400 Make track changes sidebar an experimental feature as its incomplete Change-Id: If373aa7a7efb338fd7a5305acbd19e95344a4bfc Reviewed-on: https://gerrit.libreoffice.org/15995 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 9a40006..504bf3b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -203,6 +203,9 @@ 600 + + true + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/linkmgr2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff2dd7942e42476432c2db08da71d85be7a14075 Author: Caolán McNamara Date: Tue Jun 16 16:43:15 2015 +0100 crash on use of 'echo hello' as dde command in insert section Change-Id: Ic46be8ac6da04663096e682d17faa214b324e8bf diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index c77ee19..164742b 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -272,7 +272,7 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, if( pFile ) *pFile = sTopic; if( pLinkStr ) -*pLinkStr = sCmd.copy( nTmp ); +*pLinkStr = nTmp != -1 ? sCmd.copy(nTmp) : OUString(); bRet = true; } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source
sfx2/source/appl/linkmgr2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b5fa5c0324298e70fcbfbde482fea6d554fc8760 Author: Caolán McNamara Date: Tue Jun 16 16:43:15 2015 +0100 crash on use of 'echo hello' as dde command in insert section Change-Id: Ic46be8ac6da04663096e682d17faa214b324e8bf (cherry picked from commit ff2dd7942e42476432c2db08da71d85be7a14075) diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index c3e2565..e3d4b45 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -272,7 +272,7 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, if( pFile ) *pFile = sTopic; if( pLinkStr ) -*pLinkStr = sCmd.copy( nTmp ); +*pLinkStr = nTmp != -1 ? sCmd.copy(nTmp) : OUString(); bRet = true; } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/Library_svxcore.mk svx/source
include/svx/textchain.hxx | 37
svx/Library_svxcore.mk |1
svx/source/svdraw/svdotextdecomposition.cxx |3 ++
svx/source/svdraw/textchain.cxx | 34 +
4 files changed, 75 insertions(+)
New commits:
commit f19f80e6fc3b15f2fe266fac827ffed75e1f02fe
Author: matteocam
Date: Tue Jun 16 11:36:39 2015 -0400
Added textchain.?xx files
Change-Id: Ib35e73b791c1e78b06e97e56ed6a210d129c632c
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
new file mode 100644
index 000..e094334
--- /dev/null
+++ b/include/svx/textchain.hxx
@@ -0,0 +1,37 @@
+/* -*- 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_SVX_TEXTCHAIN_HXX
+#define INCLUDED_SVX_TEXTCHAIN_HXX
+
+class SdrTextObj;
+
+class TextChain {
+
+public:
+TextChain();
+void AppendLink(SdrTextObj *);
+SdrTextObj *GetNextLink(SdrTextObj *);
+
+};
+
+#endif // INCLUDED_SVX_TEXTCHAIN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 7ed776f..816bae4 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -325,6 +325,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/svdraw/svdview \
svx/source/svdraw/svdviter \
svx/source/svdraw/svdxcgv \
+svx/source/svdraw/textchain \
svx/source/table/cell \
svx/source/table/cellcursor \
svx/source/table/cellrange \
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 45edac2..a0d6823 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1627,6 +1628,8 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
/* Begin overflow handling */
+TextChain *aTxtChain = new TextChain;
+
// If overflow occurs we have to cut the text at the right point
// If in edit mode ImpEditEngine should have taken care of this
if ( rOutliner.IsPageOverflow() && !IsInEditMode()) {
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
new file mode 100644
index 000..194d4d4
--- /dev/null
+++ b/svx/source/svdraw/textchain.cxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include
+#include
+
+TextChain::TextChain()
+{
+}
+
+void TextChain::AppendLink(SdrTextObj *)
+{
+}
+
+SdrTextObj *TextChain::GetNextLink(SdrTextObj *)
+{
+return NULL; // XXX
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source
sd/source/ui/inc/ViewShell.hxx |2 ++
sd/source/ui/unoidl/unomodel.cxx |3 +++
sd/source/ui/view/viewshel.cxx | 13 +
3 files changed, 18 insertions(+)
New commits:
commit 2f0f6960e7e6cd88c6a8da8d0d4b172286c5b9df
Author: Miklos Vajna
Date: Tue Jun 16 15:55:38 2015 +0200
tdf#91887 handle LOK_MOUSEEVENT_MOUSEMOVE in SdXImpressDocument
Change-Id: If6948e523fd681dbe289909df68364806628ead6
(cherry picked from commit 56f5a402287e735f5a9c1f84931dcbc9e7b579e7)
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 49417b6..97ed710 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -447,6 +447,8 @@ public:
void LogicMouseButtonDown(const MouseEvent& rMouseEvent);
/// Same as MouseButtonUp(), but coordinates are in logic unit.
void LogicMouseButtonUp(const MouseEvent& rMouseEvent);
+/// Same as MouseMove(), but coordinates are in logic unit.
+void LogicMouseMove(const MouseEvent& rMouseEvent);
/// Allows adjusting the point or mark of the selection to a document
coordinate.
void SetCursorMm100Position(const Point& rPosition, bool bPoint, bool
bClearMark);
/// Allows starting or ending a graphic move or resize action.
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 5190351..dc40917 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2430,6 +2430,9 @@ void SdXImpressDocument::postMouseEvent(int nType, int
nX, int nY, int nCount)
case LOK_MOUSEEVENT_MOUSEBUTTONUP:
pViewShell->LogicMouseButtonUp(aEvent);
break;
+case LOK_MOUSEEVENT_MOUSEMOVE:
+pViewShell->LogicMouseMove(aEvent);
+break;
default:
assert(false);
break;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 402c9a0..66c28b4 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -538,6 +538,19 @@ void ViewShell::LogicMouseButtonUp(const MouseEvent&
rMouseEvent)
mpActiveWindow->SetPointerPosPixel(aPoint);
}
+void ViewShell::LogicMouseMove(const MouseEvent& rMouseEvent)
+{
+// When we're not doing tiled rendering, then positions must be passed as
pixels.
+assert(GetDoc()->isTiledRendering());
+
+Point aPoint = mpActiveWindow->GetPointerPosPixel();
+mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
+
+MouseMove(rMouseEvent, 0);
+
+mpActiveWindow->SetPointerPosPixel(aPoint);
+}
+
void ViewShell::SetCursorMm100Position(const Point& rPosition, bool bPoint,
bool bClearMark)
{
if (SdrView* pSdrView = GetView())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig
icon-themes/galaxy/cmd/lc_movepagedown.png |binary icon-themes/galaxy/cmd/lc_movepagefirst.png |binary icon-themes/galaxy/cmd/lc_movepagelast.png |binary icon-themes/galaxy/cmd/lc_movepageup.png |binary icon-themes/galaxy/cmd/sc_movepagedown.png |binary icon-themes/galaxy/cmd/sc_movepagefirst.png |binary icon-themes/galaxy/cmd/sc_movepagelast.png |binary icon-themes/galaxy/cmd/sc_movepageup.png |binary icon-themes/tango/cmd/lc_movepagedown.png |binary icon-themes/tango/cmd/lc_movepagefirst.png |binary icon-themes/tango/cmd/lc_movepagelast.png |binary icon-themes/tango/cmd/lc_movepageup.png |binary icon-themes/tango/cmd/sc_movepagedown.png |binary icon-themes/tango/cmd/sc_movepagefirst.png |binary icon-themes/tango/cmd/sc_movepagelast.png |binary icon-themes/tango/cmd/sc_movepageup.png |binary officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 88 sd/Library_sd.mk | 1 sd/inc/app.hrc | 10 sd/sdi/SlideSorterController.sdi | 20 + sd/sdi/_drvwsh.sdi | 21 + sd/sdi/sdraw.sdi | 193 + sd/source/core/drawdoc2.cxx | 4 sd/source/ui/func/funavig.cxx| 156 +++ sd/source/ui/inc/DrawViewShell.hxx | 14 sd/source/ui/inc/SlideSorterViewShell.hxx| 16 sd/source/ui/inc/funavig.hxx | 50 ++ sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 200 ++ sd/source/ui/view/drviewsa.cxx | 61 +++ sd/uiconfig/sdraw/toolbar/standardbar.xml| 10 sd/uiconfig/simpress/toolbar/standardbar.xml | 10 31 files changed, 852 insertions(+), 2 deletions(-) New commits: commit d18afcc9125f427c0e6693900d24f894068d7e56 Author: Philippe Jung Date: Wed Jun 10 16:09:23 2015 +0200 tdf#91909 Uno commands for slide navigation and sorting The following change adds the following uno commands to draw and impress. Commands are in standard toolbar and not visible by default. NextPage: go to the next page PreviousPage: go to the previous page FirstPage: go to the first page LastPage: go the the last page MovePageUp: Moves the current selection above the page preceding the selection. MovePageDown: Moves the current selection below the page following the selection. MovePageTop: Moves the selection to the top. MovePageBottom: Moves the current selection to the bottom. Change-Id: I2dbd923f14fd9901fb513c58b51bc7ab91ad0a83 Reviewed-on: https://gerrit.libreoffice.org/16211 Reviewed-by: Philippe Jung Tested-by: Philippe Jung diff --git a/icon-themes/galaxy/cmd/lc_movepagedown.png b/icon-themes/galaxy/cmd/lc_movepagedown.png new file mode 100644 index 000..e7b6799 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepagedown.png differ diff --git a/icon-themes/galaxy/cmd/lc_movepagefirst.png b/icon-themes/galaxy/cmd/lc_movepagefirst.png new file mode 100644 index 000..8fbb73b Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepagefirst.png differ diff --git a/icon-themes/galaxy/cmd/lc_movepagelast.png b/icon-themes/galaxy/cmd/lc_movepagelast.png new file mode 100644 index 000..28559a9 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepagelast.png differ diff --git a/icon-themes/galaxy/cmd/lc_movepageup.png b/icon-themes/galaxy/cmd/lc_movepageup.png new file mode 100644 index 000..c241105 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_movepageup.png differ diff --git a/icon-themes/galaxy/cmd/sc_movepagedown.png b/icon-themes/galaxy/cmd/sc_movepagedown.png new file mode 100644 index 000..b8b13e3 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_movepagedown.png differ diff --git a/icon-themes/galaxy/cmd/sc_movepagefirst.png b/icon-themes/galaxy/cmd/sc_movepagefirst.png new file mode 100644 index 000..13e5a53 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_movepagefirst.png differ diff --git a/icon-theme
Re: Call for papers: send your proposals!
Hello Sophie! I wonder if there is some support for the trip, I would like to participate. I am part of the Community LibreOffice Venezuela, we have a very interesting experience about using LibreOffice in our country and would like to share with you. Atte. Linda Martinez Ubuntu User #32569 Aprendamos a desaprender; rompamos con los paradigmas de la normalidad común y liberemos nuestras mentes! Tarjeta de Presentación: http://about.me/lmartinezh http://eepurl.com/klkf5 2015-06-16 7:11 GMT-04:30 Sophie : > > Message transféré > Sujet : Call for papers: send your proposals! > Date : Tue, 16 Jun 2015 11:16:49 +0200 > De : Sophie > Pour : proje...@global.libreoffice.org > , LibreOffice-l10n > , des...@global.libreoffice.org > , > libo-marketing-p...@lists.documentfoundation.org > > > Hi all, > > This is a reminder that the call for papers is still running. Please > share your knowledge, achievements, ideas with the community, we are > very interested to hear you! > You have the choice between a presentation of 45 mn or one of 20 mn > including questions and answers. > You'll find all the details here: > http://conference.libreoffice.org/2015/call-for-papers/ > Don't hesitate to come back to me if you have any question or need help > with your travel and accommodations. > Cheers > Sophie > -- > Sophie Gautier sophie.gaut...@documentfoundation.org > GSM: +33683901545 > IRC: sophi > Co-founder - Release coordinator > The Document Foundation > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
Hi Caolán, On Tuesday, 2015-06-16 10:49:04 +0100, Caolán McNamara wrote: > http://cgit.freedesktop.org/libreoffice/core/commit/?id=103b619401f06697255167c788192601e87758b9 > calc reviewers welcome to double-check that. Seems to make sense. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpGT2dUtumo_.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Putting speech recognition into LibreOffice Writer
I run a speech recognition company (www.speechmatics.com) and we've developed some really cutting-edge technology that means that general speech recognition is far more accurate than it has been in the past (I've worked in this area for 30 years and run many speech companies). What I'd like to do is to integrate this into LibreOffice Writer so that anyone can quickly and easily edit the speech recognition output until it is a perfect, beautifully formatted transcript. This will be far faster than conventional audio transcription and so save very many thousands of people a lot of time. To work really well it has to be a very tight integration as the speech recogniser provides a very good predictive model for what comes next. It will be a completely different mode of operation which remaps keys to make corrections as fast and efficiently as possible. It also has to play the audio so that the user can hear what was really said in order to make the corrections. I'm very serious about getting this idea out and would like to engage a developer who is fluent with the low level internals of Writer to make this happen. Please get in touch if you are interested. Tony -- Dr A J Robinson, Founder. We are hiring: www.speechmatics.com/careers Speechmatics is a trading name of Cantab Research Limited Phone direct: 01223 778240 office: 01223 794497 Company reg no GB 05697423, VAT reg no 925606030 51 Canterbury Street, Cambridge, CB4 3QG, UK ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - officecfg/registry svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 29 ++
svx/Library_svx.mk |1
svx/UIConfig_svx.mk |1
svx/source/sidebar/PanelFactory.cxx |5
svx/source/sidebar/styles/StylesPropertyPanel.cxx| 55 +
svx/source/sidebar/styles/StylesPropertyPanel.hxx| 52
svx/uiconfig/ui/sidebarstylespanel.ui| 118 +++
7 files changed, 260 insertions(+), 1 deletion(-)
New commits:
commit 31fcd558a2fdf892e190d9738c224a0752997903
Author: Rishabh Kumar
Date: Mon Jun 15 01:54:43 2015 +0530
tdf#73071: Styles tab addition to the sidebar for writer
Addition of .uno:StyleApply , .uno:StyleUpdateByExample and
.uno:StyleNewByExample uno commands to the sidebar
Change-Id: Iab6f1fb465066fce523fd376038a059189f1b842
Reviewed-on: https://gerrit.libreoffice.org/16279
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
(cherry picked from commit e436f31147c7eb75908a8750b0e4053c2efdca5b)
Reviewed-on: https://gerrit.libreoffice.org/16306
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 3f9e93e..9a40006 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -231,6 +231,33 @@
+
+
+ Styles
+
+
+ StylesPropertyPanel
+
+
+ PropertyDeck
+
+
+
+WriterVariants, Annotation, visible;
+WriterVariants, DrawText, visible;
+WriterVariants, Table, visible;
+WriterVariants, Text, visible;
+WriterVariants, default,visible;
+
+
+
+
private:resource/toolpanel/SvxPanelFactory/StylesPropertyPanel
+
+
+ 100
+
+
+
Character
@@ -270,7 +297,7 @@
private:resource/toolpanel/SvxPanelFactory/TextPropertyPanel
- 100
+ 120
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index db5ab90..7cc76cb 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -182,6 +182,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/sidebar/text/TextUnderlineControl \
svx/source/sidebar/text/TextUnderlinePopup \
svx/source/sidebar/text/TextPropertyPanel \
+svx/source/sidebar/styles/StylesPropertyPanel \
svx/source/sidebar/paragraph/ParaLineSpacingControl \
svx/source/sidebar/paragraph/ParaLineSpacingPopup \
svx/source/sidebar/paragraph/ParaPropertyPanel \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f4e1f9f..ba19a9c 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/sidebarline \
svx/uiconfig/ui/sidebarparagraph \
svx/uiconfig/ui/sidebarpossize \
+svx/uiconfig/ui/sidebarstylespanel \
svx/uiconfig/ui/sidebartextpanel \
svx/uiconfig/ui/textcontrolchardialog \
svx/uiconfig/ui/textcontrolparadialog \
diff --git a/svx/source/sidebar/PanelFactory.cxx
b/svx/source/sidebar/PanelFactory.cxx
index bab0a12..a89b9e0 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -18,6 +18,7 @@
*/
#include "text/TextPropertyPanel.hxx"
+#include "styles/StylesPropertyPanel.hxx"
#include "paragraph/ParaPropertyPanel.hxx"
#include "area/AreaPropertyPanel.hxx"
#include "graphic/GraphicPropertyPanel.hxx"
@@ -144,6 +145,10 @@ Reference SAL_CALL
PanelFactory::createUIElement (
{
pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings,
aContext);
}
+else if (rsResourceURL.endsWith("/StylesPropertyPanel"))
+{
+pControl = StylesPropertyPanel::Create(pParentWindow, xFrame,
pBindings);
+}
else if (rsResourceURL.endsWith("/ParaPropertyPanel"))
{
pControl = ParaPropertyPanel::Create(pParentWindow, xFrame, pBindings,
xSidebar);
diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx
b/svx/source/sidebar/styles/StylesPropertyPanel.cxx
new file mode 100644
index 000..12190ca
--- /dev/null
+++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx
@@ -0,0 +1,55 @@
+#include "StylesPropertyPanel.hxx"
+#include
+
+using namespace css;
+using namespace css::uno;
+
+namespace svx { namespace sidebar {
+
+VclPtr StylesPropertyPanel::Create (
+vcl::Window* pP
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf8255.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx|9 +
writerfilter/source/dmapper/PropertyMap.cxx | 12 +++-
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 853033da3710f0e8df1b5d0d5355c6b0ce1c9ea0
Author: Miklos Vajna
Date: Mon Jun 8 07:48:42 2015 +0200
tdf#82553 DOCX import: handle table margin when converting floattables
(cherry picked from commit 292ec5fe8d01af6119325f1a426422bb42e58615)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I7a3a233a34453153b3e1c0fe3d60bb0ede65dc86
Reviewed-on: https://gerrit.libreoffice.org/16248
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/ooxmlimport/data/tdf8255.docx
b/sw/qa/extras/ooxmlimport/data/tdf8255.docx
new file mode 100644
index 000..366e498
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf8255.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0721a1e..4a7a8bc 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2581,6 +2581,15 @@ DECLARE_OOXMLIMPORT_TEST(testFdo87488, "fdo87488.docx")
}
}
+DECLARE_OOXMLIMPORT_TEST(testTdf8255, "tdf8255.docx")
+{
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDrawPageSupplier(xTextDocument, uno::UNO_QUERY);
+uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
+// This was 1: a full-page-wide multi-page floating table was imported as
a TextFrame.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount());
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 845dbe6..f83862c 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1037,6 +1037,16 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl& rDM_Impl )
for (size_t i = 0; i < rPendingFloatingTables.size(); ++i)
{
FloatingTableInfo& rInfo = rPendingFloatingTables[i];
+
+// Count the layout width of the table.
+sal_Int32 nTableWidth = rInfo.m_nTableWidth;
+sal_Int32 nLeftMargin = 0;
+if (rInfo.getPropertyValue("LeftMargin") >>= nLeftMargin)
+nTableWidth += nLeftMargin;
+sal_Int32 nRightMargin = 0;
+if (rInfo.getPropertyValue("RightMargin") >>= nRightMargin)
+nTableWidth += nRightMargin;
+
// If the table is wider than the text area, then don't create a fly
// for the table: no wrapping will be performed anyway, but multi-page
// tables will be broken.
@@ -1045,7 +1055,7 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl& rDM_Impl )
// If there are columns, always create the fly, otherwise the columns
would
// restrict geometry of the table.
if ( ( rInfo.getPropertyValue("HoriOrientRelation") ==
text::RelOrientation::PAGE_FRAME ) ||
- ( rInfo.m_nTableWidth < nTextAreaWidth ) || ColumnCount() + 1 >=
2 )
+ nTableWidth < nTextAreaWidth || ColumnCount() + 1 >= 2 )
xBodyText->convertToTextFrame(rInfo.m_xStart, rInfo.m_xEnd,
rInfo.m_aFrameProperties);
}
rPendingFloatingTables.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/uiconfig
svx/uiconfig/ui/sidebararea.ui |7 +++ 1 file changed, 7 insertions(+) New commits: commit f9bd17b3c1b2dd656c707512fd34a3bdec5d33c9 Author: Rishabh Kumar Date: Mon Jun 8 16:35:05 2015 +0530 tdf#88843 Set Maximum Value for Transparency spin button in area sidebar tab Change-Id: Idb1c5051de5ddb0501b8d1440f8abe62074296bc Reviewed-on: https://gerrit.libreoffice.org/16144 Reviewed-by: Katarina Behrens Tested-by: Katarina Behrens (cherry picked from commit c1692f620610621a139e54fb1f9d11d4c177608d) Reviewed-on: https://gerrit.libreoffice.org/16204 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui index adad038..708533c 100644 --- a/svx/uiconfig/ui/sidebararea.ui +++ b/svx/uiconfig/ui/sidebararea.ui @@ -3,6 +3,12 @@ + +0 +100 +1 +10 + True False @@ -185,6 +191,7 @@ True 100 ⢠+adjustment1 False 5 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-4' - wizards/source
wizards/source/access2base/Recordset.xba | 21 + 1 file changed, 9 insertions(+), 12 deletions(-) New commits: commit 8a315c82aa6609800b4651811cf72c06cc1b9b29 Author: Jean-Pierre Ledure Date: Sat Jun 13 14:33:36 2015 +0200 Access2Base - Correct behaviour of MoveNext, MovePrevious (patch 03) Bug in MoveNext and MovePrevious methods of Recordset class module Reported in https://forum.openoffice.org/en/forum/viewtopic.php?f=47&t=76640 Change-Id: I6c2a3f6e23bbc414f594c791a86066d46a7b09f4 Reviewed-on: https://gerrit.libreoffice.org/16257 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/wizards/source/access2base/Recordset.xba b/wizards/source/access2base/Recordset.xba index 4a9c833..4df3af2 100644 --- a/wizards/source/access2base/Recordset.xba +++ b/wizards/source/access2base/Recordset.xba @@ -920,18 +920,15 @@ Dim l As Long, lRow As Long End If End Select - Select Case True - Case .isBeforeFirst() - _BOF = True - _Move = False - Case .isAfterlast() - _EOF = True - _Move = False - Case Else - If .rowDeleted() Then Goto Error_RowDeleted - If .rowUpdated() Then .refreshRow() - _Move = True - End Select + _BOF = .isBeforeFirst() ' https://forum.openoffice.org/en/forum/viewtopic.php?f=47&t=76640 + _EOF = .isAfterlast() + If _BOF Or _EOF Then + _Move = False + Else + If .rowDeleted() Then Goto Error_RowDeleted + If .rowUpdated() Then .refreshRow() + _Move = True + End If End With Exit_Function: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/core/tool/token.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 012a2f0876663af77316c657c0dbdafd82acb79e Author: Eike Rathke Date: Sat Jun 13 15:12:32 2015 +0200 do not access token data after token has been destroyed Change-Id: I624e64745fd3874be3e1bd3df6bac18dfb17aebb (cherry picked from commit c1fc84ac140d519e0bfa7a607e36771682b08eed) Reviewed-on: https://gerrit.libreoffice.org/16258 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index a96936c..1e5c7d2 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2245,9 +2245,9 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons OUString aTabName; sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef1.Tab(), aTabName, nFileId); -pCode[j]->DecRef(); ScExternalDoubleRefToken* pToken = new ScExternalDoubleRefToken(nFileId, aTabName, rRef); pToken->IncRef(); +pCode[j]->DecRef(); // ATTENTION: rRef can't be used after this point pCode[j] = pToken; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebarline.ui | 204 - 1 file changed, 81 insertions(+), 123 deletions(-) New commits: commit 4fb65441709d02946f4b24da7839dba7ec1e Author: Rishabh Kumar Date: Sun Jun 14 16:28:42 2015 +0530 Line Section reorganisation Arrow Style, Corner Style and Cap Style are hidden Change-Id: I0bfab4b23219d01ebfdb3a9ff0dc36777a412ec5 Reviewed-on: https://gerrit.libreoffice.org/16264 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui index 5aa8431..6309198 100644 --- a/svx/uiconfig/ui/sidebarline.ui +++ b/svx/uiconfig/ui/sidebarline.ui @@ -1,6 +1,7 @@ + - + 100 5 @@ -31,47 +32,33 @@ 6 6 - + True False 0 -_Width: +_Transparency: True 0 -0 -1 -1 +3 - -120 + True -False +True True -Select the width of the line. -Select the width of the line. - - -105 -True -False -.uno:SelectWidth -True - - -True -True - - +Specify the transparency of the line. +Specify the transparency of the line. +True +⢠+adjustment1 +5 1 -0 -1 -1 +3 @@ -81,33 +68,10 @@ 0 _Color: True -color 0 -1 -1 -1 - - - - -True -True -True -Specify the transparency of the line. -Specify the transparency of the line. -True -⢠-True -adjustment1 -5 - - -1 2 -1 -1 @@ -137,25 +101,73 @@ 1 +2 + + + + +120 +True +False +True +Select the width of the line. +Select the width of the line. + + +105 +True +False +.uno:SelectWidth +True + + +True +True + + + + +1 1 -1 -1 - + True False 0 -_Transparency: +_Width: True -linetransparency:0% 0 -2 -1 -1 +1 + + + + +True +False +0 +_Style: +True + + +0 +0 + + + + +True +False +T
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source svx/source
sc/source/core/data/drwlayer.cxx | 59 +++
svx/source/svdraw/svdoashp.cxx |1
2 files changed, 60 insertions(+)
New commits:
commit 0c02e1892ad87aa81e29b5642b16db3f4c128418
Author: Henry Castro
Date: Fri Apr 24 16:55:01 2015 -0400
Resolves tdf#67712 form controls and draw objects
anchored to cell but changes position after reopening
Also included tdf#68797 "FILEOPEN lost position of lines
anchored to cell". It was marked as duplicate but the
step to reproduce are different.
Conflicts:
sc/qa/unit/subsequent_filters-test.cxx
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
Reviewed-on: https://gerrit.libreoffice.org/15523
Tested-by: Jenkins
Reviewed-by: Andras Timar
(cherry picked from commit 487880b6882ec01c1b4679eae60bec484272a86b)
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
Change-Id: Ia1c4010f118749256077a0ecad6ca16b867d22f7
(cherry picked from commit b1f1c77687e301c99e81631d33298e44bdb5ca84)
Reviewed-on: https://gerrit.libreoffice.org/16280
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 23e0de3..6649953 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include "scitems.hxx"
#include
@@ -116,6 +117,14 @@ void ScUndoObjData::Undo()
pData->maStart = aOldStt;
pData->maEnd = aOldEnd;
}
+
+// Undo also an untransformed anchor
+pData = ScDrawLayer::GetNonRotatedObjData( pObj );
+if (pData)
+{
+pData->maStart = aOldStt;
+pData->maEnd = aOldEnd;
+}
}
void ScUndoObjData::Redo()
@@ -127,6 +136,14 @@ void ScUndoObjData::Redo()
pData->maStart = aNewStt;
pData->maEnd = aNewEnd;
}
+
+// Redo also an untransformed anchor
+pData = ScDrawLayer::GetNonRotatedObjData( pObj );
+if (pData)
+{
+pData->maStart = aNewStt;
+pData->maEnd = aNewEnd;
+}
}
ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) :
@@ -495,6 +512,15 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW
nRow1, SCCOL nCol2,SC
{
if ( pObj->ISA( SdrRectObj ) && pData->maStart.IsValid() &&
pData->maEnd.IsValid() )
pData->maStart.PutInOrder( pData->maEnd );
+
+// Update also an untransformed anchor thats what we stored (
and still do ) to xml
+ScDrawObjData* pNoRotatedAnchor = GetNonRotatedObjData( pObj,
false );
+if ( pNoRotatedAnchor )
+{
+pNoRotatedAnchor->maStart = pData->maStart;
+pNoRotatedAnchor->maEnd = pData->maEnd;
+}
+
AddCalcUndo( new ScUndoObjData( pObj, aOldStt, aOldEnd,
pData->maStart, pData->maEnd ) );
RecalcPos( pObj, *pData, bNegativePage, bUpdateNoteCaptionPos
);
}
@@ -759,6 +785,39 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj,
ScDrawObjData& rData, bool bNegati
ScDrawObjData& rNoRotatedAnchor = *GetNonRotatedObjData( pObj, true );
if (rData.maLastRect.IsEmpty())
{
+// Every shape it is saved with an negative offset relative to cell
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+{
+double fRotate(0.0);
+double fShearX(0.0);
+
+Point aPoint;
+Rectangle aRect;
+
+basegfx::B2DTuple aScale;
+basegfx::B2DTuple aTranslate;
+basegfx::B2DPolyPolygon aPolyPolygon;
+basegfx::B2DHomMatrix aOriginalMatrix;
+
+aRect = pDoc->GetMMRect(nCol1, nRow1, nCol1 , nRow1, nTab1);
+
+if (bNegativePage)
+aPoint.X() = aRect.Right();
+else
+aPoint.X() = aRect.Left();
+aPoint.Y() = aRect.Top();
+
+pObj->TRGetBaseGeometry(aOriginalMatrix, aPolyPolygon);
+aOriginalMatrix.decompose(aScale, aTranslate, fRotate,
fShearX);
+aTranslate += ::basegfx::B2DTuple(aPoint.X(), aPoint.Y());
+aOriginalMatrix =
basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
+aScale,
+fShearX,
+fRotate,
+aTranslate);
+pObj->TRSetBaseGeometry(aOriginalMatrix, aPolyPolygon);
+}
+
// It's confusing ( but blame that we persist the anchor in terms
of unrotated shape )
// that the initial anchor we get here is in terms of an unrotated
shape ( if the shape is rotated )
// we need to save the old anchor ( for persisting ) and also
track any resize or repo
[GSoC15] Chained Text Boxes - A plan of next milestones
Hi there, I was thinking of the next important goals for something that can be (hopefully) merged in master at the end of the Summer and I thought of sharing publicly my plan. The estimated times are kinda pessimistic since it is likely I missed some important. - Get Underflow working as well as overflow (1-2 weeks) - Have cursor motion work automatically among chained boxes (1 week) - Have undo working (1 week) - Have style sheets preserved and allow # of boxes > 2. (2 weeks) In the worst case this should keep me busy until around 19th of July. Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 70465, which changed state. Bug 70465 Summary: [a11y] with Assistive Technology Tools enabled building "Expert Config" tool is slow and resource intensive https://bugs.documentfoundation.org/show_bug.cgi?id=70465 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 - vcl/opengl
vcl/opengl/win/WinDeviceInfo.cxx | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 3a8aff659bbd32543f28f796f59b6225f1011876
Author: Tor Lillqvist
Date: Tue Jun 16 17:14:42 2015 +0300
Drop duplicated statements
In the original Mozilla code the statements differed, as there were
separate ones for FEATURE_OPENGL_LAYERS and FEATURE_WEBGL_OPENGL.
These two uses have been combined here.
Change-Id: Idc2533f23d48761249a905b298b1ebbfde0e3a54
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 33360c4..9103324 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -1121,12 +1121,6 @@ void WinOpenGLDeviceInfo::FillBlacklist()
GetDeviceVendor(wgl::VendorATI), wgl::DriverInfo::allDevices,
wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
-GetDeviceVendor(wgl::VendorATI), wgl::DriverInfo::allDevices,
-wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
-APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
-GetDeviceVendor(wgl::VendorAMD), wgl::DriverInfo::allDevices,
-wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
-APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
GetDeviceVendor(wgl::VendorAMD), wgl::DriverInfo::allDevices,
wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
@@ -1175,9 +1169,6 @@ void WinOpenGLDeviceInfo::FillBlacklist()
APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
GetDeviceVendor(wgl::VendorIntel), wgl::DriverInfo::allDevices,
wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
-APPEND_TO_DRIVER_BLOCKLIST2( wgl::DRIVER_OS_ALL,
-GetDeviceVendor(wgl::VendorIntel), wgl::DriverInfo::allDevices,
-wgl::DRIVER_LESS_THAN, wgl::DriverInfo::allDriverVersions );
/**
* Disable acceleration on Intel HD 3000 for graphics drivers <=
8.15.10.2321.
commit b2cd406dce247786f4b7a5a2ccec0bd4c6fdf3cc
Author: Tor Lillqvist
Date: Tue Jun 16 17:10:48 2015 +0300
Log blacklisting more visibly
Change-Id: I7c661181ed7904650eff103d097ab357d3b8dfea
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index abc367a..33360c4 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -722,6 +722,7 @@ bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList()
}
}
+SAL_INFO("vcl.opengl", (match ? "BLACKLISTED" : "not blacklisted"));
return match;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optaboutconfig.cxx | 652 +-
cui/source/options/optaboutconfig.hxx |6
2 files changed, 345 insertions(+), 313 deletions(-)
New commits:
commit db35b73037483cd22cd7d4ac93fe40f23fbe3967
Author: Mihály Palenik
Date: Tue Jun 16 11:51:10 2015 +0200
Change table to tree view in Expert Configuration dialog.
Expert Configuration dialog was too slow when accessibility was used.
Therefore the table was changed to tree view. In tree view the children
of entries is loaded dynamically.
Change-Id: I267833e46005058fdfedb6f012afe2f9b390636b
Reviewed-on: https://gerrit.libreoffice.org/16307
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index ea0e707..121060d 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -158,7 +158,6 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window*
pParent/*, const SfxI
util::SearchFlags::REG_NOT_ENDOFLINE);
m_pPrefBox->SetTabs(aTabs, MAP_PIXEL);
-m_pPrefBox->SetAlternatingRowColors( true );
}
CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
@@ -177,17 +176,17 @@ void CuiAboutConfigTabPage::dispose()
ModelessDialog::dispose();
}
-void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString&
rStatus, const OUString& rType, const OUString& rValue)
+void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString&
rStatus,
+const OUString& rType, const OUString&
rValue, SvTreeListEntry *pParentEntry)
{
SvTreeListEntry* pEntry = new SvTreeListEntry;
-
pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(),
false)); //It is needed, otherwise causes crash
pEntry->AddItem( new SvLBoxString( pEntry, 0, rProp));
pEntry->AddItem( new SvLBoxString( pEntry, 0, rStatus));
pEntry->AddItem( new SvLBoxString( pEntry, 0, rType));
pEntry->AddItem( new SvLBoxString( pEntry, 0, rValue));
-m_pPrefBox->Insert( pEntry );
+m_pPrefBox->Insert( pEntry, pParentEntry );
SvTreeListEntry* pEntryClone = new SvTreeListEntry;
pEntryClone->Clone( pEntry );
@@ -227,190 +226,211 @@ bool CuiAboutConfigTabPage::FillItemSet()
return bModified;
}
-void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >&
xNameAccess)
+void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >&
xNameAccess, SvTreeListEntry *pParentEntry)
{
-OUString sPath = Reference< XHierarchicalName >(
-xNameAccess, uno::UNO_QUERY_THROW )->getHierarchicalName();
uno::Sequence< OUString > seqItems = xNameAccess->getElementNames();
for( sal_Int32 i = 0; i < seqItems.getLength(); ++i )
{
Any aNode = xNameAccess->getByName( seqItems[i] );
-bool bNotLeaf = false;
-
-Reference< XNameAccess > xNextNameAccess;
+Reference< XNameAccess > xChildNameAccess;
try
{
-xNextNameAccess = Reference< XNameAccess >(aNode, uno::UNO_QUERY);
-bNotLeaf = xNextNameAccess.is();
-}
-catch (const RuntimeException& e)
-{
-SAL_WARN( "cui.options", "CuiAboutConfigTabPage: exception " <<
e.Message);
-}
+xChildNameAccess = Reference< XNameAccess >(aNode, uno::UNO_QUERY);
+OUString sPath = Reference< XHierarchicalName >(
+xChildNameAccess, uno::UNO_QUERY_THROW
)->getHierarchicalName();
+uno::Sequence< OUString > seqChildItems =
xChildNameAccess->getElementNames();
-if (bNotLeaf)
-{
-// not leaf node
-FillItems( xNextNameAccess );
-}
-else
-{
-// leaf node
-OUString sType = aNode.getValueTypeName();
+bool bIsNotLeaf = false;
-OUString sValue;
-switch( aNode.getValueType().getTypeClass() )
+for( sal_Int32 l = 0; l < seqChildItems.getLength(); ++l )
{
-case ::com::sun::star::uno::TypeClass_VOID:
-break;
+aNode = xChildNameAccess->getByName( seqChildItems[l] );
-case ::com::sun::star::uno::TypeClass_BOOLEAN:
-sValue = OUString::boolean( aNode.get() );
-break;
+Reference< XNameAccess > xGrandChildNameAccess = Reference<
XNameAccess >(aNode, uno::UNO_QUERY);
+if(xGrandChildNameAccess.is())
+{
+// not leaf node
+if(bIsNotLeaf)
+continue;
+SvTreeListEntry* pEntry = new SvTreeListEntry;
+pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0,
m_pPrefBox->GetDefaultExpandedNodeImage(),
+
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - solenv/gbuild
solenv/gbuild/JunitTest.mk |2 +-
solenv/gbuild/platform/com_MSC_class.mk | 17 -
2 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit ad8e91255b6c07adc1e8c04e06eba55c6a4e8b3d
Author: Juergen Funk
Date: Fri Jun 12 15:00:12 2015 +0200
make debugrun under Windows
Debugging with Visual-Studio, attach to soffice.bin
Description:
Start
make debugrun
after the start of LO, in VS-Debugger
"Attach to Process" to the soffice.bin
then start in other box the test with
make gb_JunitTest_DEBUGRUN=T JunitTest_YYY"
Change-Id: I44571d1d4feafe9ce836d71781eaf793fe72cb92
Reviewed-on: https://gerrit.libreoffice.org/16290
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 335ea1819b08dbefabb5d67445668d4868bb1db0)
Signed-off-by: Michael Stahl
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 8370603..4078421 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -45,7 +45,7 @@ $(call gb_JunitTest_get_target,%) :
&& echo "to rerun just this failed test without all others,
run:" \
&& echo && echo "make JunitTest_$*" && echo \
&& echo "cd into the module dir to run the tests faster" \
- && echo "Or to do interactive debugging (non-Windows), run two
shells with:" \
+ && echo "Or to do interactive debugging, run two shells with:" \
&& echo \
&& echo "make debugrun" \
&& echo "make gb_JunitTest_DEBUGRUN=T JunitTest_$*" \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 4064527..70768b6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -409,12 +409,27 @@ endif
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}"
\
+ -Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \
-Dorg.openoffice.test.arg.env=PATH="PATH" \
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call
gb_JunitTest_get_userdir,$(1)))
+ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1))
\
endef
+
+define gb_Module_DEBUGRUNCOMMAND
+printf "\nAttach the debugger to soffice.bin\n\n"
+unset VCL_HIDE_WINDOWS && \
+OFFICESCRIPT=`mktemp` && \
+printf "$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe" > $${OFFICESCRIPT} && \
+printf " --norestore --nologo '--accept=pipe,name=$(USER);urp;'\n" >>
$${OFFICESCRIPT} && \
+$(SHELL) $${OFFICESCRIPT} && \
+rm $${OFFICESCRIPT}
+endef
+
+
+
+
# PythonTest class
gb_PythonTest_PRECOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/ViewShell.hxx |2 ++
sd/source/ui/unoidl/unomodel.cxx |3 +++
sd/source/ui/view/viewshel.cxx | 13 +
3 files changed, 18 insertions(+)
New commits:
commit 56f5a402287e735f5a9c1f84931dcbc9e7b579e7
Author: Miklos Vajna
Date: Tue Jun 16 15:55:38 2015 +0200
tdf#91887 handle LOK_MOUSEEVENT_MOUSEMOVE in SdXImpressDocument
Change-Id: If6948e523fd681dbe289909df68364806628ead6
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 49417b6..97ed710 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -447,6 +447,8 @@ public:
void LogicMouseButtonDown(const MouseEvent& rMouseEvent);
/// Same as MouseButtonUp(), but coordinates are in logic unit.
void LogicMouseButtonUp(const MouseEvent& rMouseEvent);
+/// Same as MouseMove(), but coordinates are in logic unit.
+void LogicMouseMove(const MouseEvent& rMouseEvent);
/// Allows adjusting the point or mark of the selection to a document
coordinate.
void SetCursorMm100Position(const Point& rPosition, bool bPoint, bool
bClearMark);
/// Allows starting or ending a graphic move or resize action.
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d64c2b6..1029f19 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2411,6 +2411,9 @@ void SdXImpressDocument::postMouseEvent(int nType, int
nX, int nY, int nCount)
case LOK_MOUSEEVENT_MOUSEBUTTONUP:
pViewShell->LogicMouseButtonUp(aEvent);
break;
+case LOK_MOUSEEVENT_MOUSEMOVE:
+pViewShell->LogicMouseMove(aEvent);
+break;
default:
assert(false);
break;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 8e87137..d35cd02 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -523,6 +523,19 @@ void ViewShell::LogicMouseButtonUp(const MouseEvent&
rMouseEvent)
mpActiveWindow->SetPointerPosPixel(aPoint);
}
+void ViewShell::LogicMouseMove(const MouseEvent& rMouseEvent)
+{
+// When we're not doing tiled rendering, then positions must be passed as
pixels.
+assert(GetDoc()->isTiledRendering());
+
+Point aPoint = mpActiveWindow->GetPointerPosPixel();
+mpActiveWindow->SetLastMousePos(rMouseEvent.GetPosPixel());
+
+MouseMove(rMouseEvent, 0);
+
+mpActiveWindow->SetPointerPosPixel(aPoint);
+}
+
void ViewShell::SetCursorMm100Position(const Point& rPosition, bool bPoint,
bool bClearMark)
{
if (SdrView* pSdrView = GetView())
___
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/core/undo/undel.cxx | 42 +-
sw/source/core/undo/unmove.cxx | 12 ++---
sw/source/core/undo/unredln.cxx | 92
sw/source/core/undo/untblk.cxx | 80 +-
4 files changed, 113 insertions(+), 113 deletions(-)
New commits:
commit 6f7afbb4dccef0de5521d0a2d1cfef71690222f3
Author: Caolán McNamara
Date: Tue Jun 16 13:38:01 2015 +0100
change pointer to reference for the win
Change-Id: Ia43a07dc7d6bc87bba297636771ee4bd3a0b477d
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index c2871f9..bdfd99f8 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -745,14 +745,14 @@ static void lcl_ReAnchorAtContentFlyFrames( const
SwFrameFormats& rSpzArr, SwPos
void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
{
-SwDoc *const pDoc = & rContext.GetDoc();
+SwDoc& rDoc = rContext.GetDoc();
sal_uLong nCalcStt = nSttNode - nNdDiff;
if( nSectDiff && bBackSp )
nCalcStt += nSectDiff;
-SwNodeIndex aIdx( pDoc->GetNodes(), nCalcStt );
+SwNodeIndex aIdx(rDoc.GetNodes(), nCalcStt);
SwNode* pInsNd = &aIdx.GetNode();
{ // code block so that SwPosition is detached when deleting a Node
@@ -761,8 +761,8 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
{
if( pInsNd->IsTableNode() )
{
-pInsNd = pDoc->GetNodes().MakeTextNode( aIdx,
-pDoc->GetDfltTextFormatColl() );
+pInsNd = rDoc.GetNodes().MakeTextNode( aIdx,
+rDoc.GetDfltTextFormatColl() );
--aIdx;
aPos.nNode = aIdx;
aPos.nContent.Assign( pInsNd->GetContentNode(), nSttContent );
@@ -794,13 +794,13 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
if( pSttStr && !bFromTableCopy )
{
sal_uLong nOldIdx = aPos.nNode.GetIndex();
-pDoc->getIDocumentContentOperations().SplitNode( aPos, false );
+rDoc.getIDocumentContentOperations().SplitNode( aPos, false );
// After the split all objects are anchored at the first
// paragraph, but the pHistory of the fly frame formats relies
// on anchoring at the start of the selection
// => selection backwards needs a correction.
if( bBackSp )
-lcl_ReAnchorAtContentFlyFrames(
*pDoc->GetSpzFrameFormats(), aPos, nOldIdx );
+lcl_ReAnchorAtContentFlyFrames(*rDoc.GetSpzFrameFormats(),
aPos, nOldIdx);
pTextNd = aPos.nNode.GetNode().GetTextNode();
}
if( pTextNd )
@@ -821,9 +821,9 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
if (nSttContent < pNd->GetText().getLength())
{
sal_uLong nOldIdx = aPos.nNode.GetIndex();
-pDoc->getIDocumentContentOperations().SplitNode( aPos,
false );
+rDoc.getIDocumentContentOperations().SplitNode( aPos,
false );
if( bBackSp )
-lcl_ReAnchorAtContentFlyFrames(
*pDoc->GetSpzFrameFormats(), aPos, nOldIdx );
+
lcl_ReAnchorAtContentFlyFrames(*rDoc.GetSpzFrameFormats(), aPos, nOldIdx);
}
else
++aPos.nNode;
@@ -844,12 +844,12 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
nMoveIndex -= nSectDiff + 1;
++nDiff;
}
-SwNodeIndex aMvIdx( pDoc->GetNodes(), nMoveIndex );
+SwNodeIndex aMvIdx(rDoc.GetNodes(), nMoveIndex);
SwNodeRange aRg( aPos.nNode, 0 - nDiff, aPos.nNode, 1 - nDiff );
--aPos.nNode;
if( !bJoinNext )
pMovedNode = &aPos.nNode.GetNode();
-pDoc->GetNodes()._MoveNodes( aRg, pDoc->GetNodes(), aMvIdx, true );
+rDoc.GetNodes()._MoveNodes(aRg, rDoc.GetNodes(), aMvIdx, true);
++aPos.nNode;
}
@@ -857,7 +857,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
{
SwNodeRange aRange( *pMvStt, 0, *pMvStt, nNode );
SwNodeIndex aCopyIndex( aPos.nNode, -1 );
-pDoc->GetUndoManager().GetUndoNodes()._Copy( aRange, aPos.nNode );
+rDoc.GetUndoManager().GetUndoNodes()._Copy( aRange, aPos.nNode );
if( nReplaceDummy )
{
@@ -872,16 +872,16 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
aPos = SwPosition( aCopyIndex );
nMoveIndex = aPos.nNode.GetIndex() + nReplaceDummy + 1;
}
-SwNodeIndex aMvIdx( pDoc->GetNodes(), nMoveIndex );
+SwNodeIndex aMvIdx(rDoc.Ge
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/core/data/document.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit b121efd08e9cc396af25b79c2a4ee55507ff6ee0
Author: Eike Rathke
Date: Mon Jun 15 23:45:28 2015 +0200
Resolves: tdf#91411 end listening only on selected sheets
... not in cell areas of all sheets.
(cherry picked from commit 80ec99db4325a439a8a3f1d420d0a80f8bf9c439)
Conflicts:
sc/source/core/data/document.cxx
Change-Id: I8d19c15c6d8d89652ac5695214bc4dd930783087
Reviewed-on: https://gerrit.libreoffice.org/16303
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5889916..4a4f0004 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1779,12 +1779,15 @@ void ScDocument::DeleteArea(
std::vector aGroupPos;
sc::EndListeningContext aCxt(*this);
ScRange aRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
-for (size_t i = 0; i < maTabs.size(); ++i)
+for (SCTAB i = 0; i < static_cast(maTabs.size()); i++)
{
-aRange.aStart.SetTab(i);
-aRange.aEnd.SetTab(i);
+if (rMark.GetTableSelect(i))
+{
+aRange.aStart.SetTab(i);
+aRange.aEnd.SetTab(i);
-EndListeningIntersectedGroups(aCxt, aRange, &aGroupPos);
+EndListeningIntersectedGroups(aCxt, aRange, &aGroupPos);
+}
}
aCxt.purgeEmptyBroadcasters();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: PyUNO usability improvements
Hi, On Tuesday, 2015-06-16 12:34:15 +0200, Michael Stahl wrote: > > 2. Cell ranges > > == > > > > cell = cellrange[0,0] # Access cell by indices > > rng = cellrange[0,1:2] # Access cell range by index,slice > > rng = cellrange[1:2,0] # Access cell range by slice,index > > rng = cellrange[0:1,2:3]# Access cell range by slices > > rng = cellrange['A1:B2']# Access cell range by descriptor > > rng = cellrange['Name'] # Access cell range by name > > > > Note that the indices used are in Python/C order, and differ from > > the arguments to methods provided by XCellRange. > > - The statement cellrange[r,c], which returns the cell from row r > > and column c, is equivalent to calling > > XCellRange::getCellByPosition(c,r) Is there a specific reason for this? Why not keep the order the API uses? My concern is, that if these get mixed the user will get confused.. > > - The statement cellrange[t:b,l:r], which returns a cell range > > covering rows t to b(non-inclusive) and columns l to r(non- > > inclusive), is equivalent to calling > > XCellRange::getCellRangeByPosition(l,t,r-1,b-1). Which when keeping c,r order would be cellrange[l:r,t:b], slightly nearer to the API. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgp1wi_QZeeuM.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/vmiklos/mm-embedding-5.0'
New branch 'private/vmiklos/mm-embedding-5.0' available with the following commits: commit 3602509319615e311a8b3f05474847faadda3df1 Author: Miklos Vajna Date: Thu Jun 11 12:43:17 2015 +0200 SwDocShell: re-store embedded data source def only when location changes (cherry picked from commit ddaca012d2715e5270dfeef43452e07aa7a9508c) Change-Id: Ic667491026e9e88a72253aa079c77b8079cac588 commit a726d5b29cd9ba2e0549004137117ce495f293b3 Author: Stephan Bergmann Date: Thu Jun 11 09:53:03 2015 +0200 So assume SwUiWriterTest::testEmbeddedDataSource works on MACOSX now too ...similar to 6cca91f7ada91701443225061a5dd0ae81a98b8e "CppunitTest_sw_uiwriter: enable on Windows," whatever the original problem was in 601ba26cb5737970e7e9a173515bb21ebde55db9 "Fix the Windows and OS X build temporarily." Change-Id: Ia1befff90d773637e01e6d88e398ae21a1d47108 (cherry picked from commit 808d40139283e6dbc2248efaf661502f6e22f0ac) commit e122d2abefa01d7f2dac0eab95ef86dec7ad70df Author: Miklos Vajna Date: Thu Jun 11 09:42:29 2015 +0200 SwDBManager: avoid registering two data sources when creating an emebedded one SwDBManager::LoadAndRegisterDataSource() calls SwXDocumentSettings::setPropertyValue() to set its EmbeddedDatabaseName UNO property, when creating the embedded data source definition. OTOH, during load, SwXDocumentSettings calls SwDBManager::LoadAndRegisterEmbeddedDataSource() to register the data source. The result is that when creating the embedded definition using the MM wizard, we registered two data sources. Fix the problem by first setting the UNO property, and only then storing the data source definition. Change-Id: I3efc141d9ab94828007a48a8bf5949b4f3b6510a (cherry picked from commit 12783429cfa5984adf02efdfcbe6e1653d58365f) commit ea3b0fb06b162d719eadffcade1b881d8ce3dd64 Author: Miklos Vajna Date: Wed Jun 10 19:04:04 2015 +0200 sw: remove embedded data source on location deregistration Change-Id: I5b2a24fee50a25a41ba26787f7e30409348d7808 (cherry picked from commit b8b4ac9e6e8f03fb84bddb714d3c5908a45153b1) commit b716f0d676990f24acc3e058b41b908ac16c2a6d Author: Miklos Vajna Date: Wed Jun 10 18:49:56 2015 +0200 CppunitTest_sw_uiwriter: enable on Windows I hope that the underlying problem is fixed now by commit 670100fcfbb39d3dbe4afdb27fbced26d7b14283 (Remove FastLoader optimization, 2015-06-10). Change-Id: I1cb577ec1f50a45b40683031e79c0999338a2926 (cherry picked from commit 6cca91f7ada91701443225061a5dd0ae81a98b8e) commit 52917eb39e3a8af11021523b58613629d1ac079b Author: Miklos Vajna Date: Wed Jun 10 14:22:26 2015 +0200 SfxObjectShell::CopyStoragesOfUnknownMediaType: still try to copy Base streams When Base is embedded in a Writer document, we still need this when the document is saved for the first time after embedding. Change-Id: I1103da01838abd4ac1b03dc4d44e10db3ce650bc (cherry picked from commit 4897f10beab678494a7c2dfdc140c424154e9f8c) commit d7125c01490487e9cbde443a5dc8cfae529c6a70 Author: Miklos Vajna Date: Wed Jun 10 14:20:28 2015 +0200 SwDBManager::LoadAndRegisterDataSource: restore lost hunk Accidently removed in commit f01f31201f9b26b3071ab25f9a5a3a0311ff7423 (SwDBManager: extract StoreEmbeddedDataSource() from registration code, 2015-06-09). Change-Id: I27e47249b92b8fd19dcd09a1226f5e80184ea8db (cherry picked from commit 23c467fd7a1932015ef209f9db49acd167fd713f) commit cb4db4eca5cedf3f9d7b441b0de80fd7240d1362 Author: Stephan Bergmann Date: Wed Jun 10 12:27:02 2015 +0200 Remove FastLoader optimization ...that was introduced in b88a62cc97613e5dc00c806f59982cb57f9d1dc8 "CWS-TOOLING: integrate CWS dbaperf2," apparently to speed up later activity by pre-loading a JVM or Calc. The problem is that any spawned FastLoader thread was never joined, so could still run during exit. That caused many spurious failures of CppunitTest_sw_uiwriter after df726c8b3e80bf2e1696f901ea01f192dcb8a77e "CppunitTest_sw_uiwriter: add embedded data source definition testcase" triggered spawning such FastLoader threads there. Adding code to join any spawned FastLoader thread is not easy, though. For one, it is not clear whether there would not be very many (terminated, waiting to be joined, thus still holding up system resources) such treads when doing the join in ~DatasourceURLListener or DatasourceURLListener::disposing. For another, a naive attempt at joining in ~DatasourceURLListener leads to deadlock, as it is called with the SolarMutex locked and the E_CALC branch in FastLoader::run blocks waiting to acquire it. Thus, the best approach appears to be to remove this optimization. Hopefully, that does not have too dire performance impacts on typcial user scenari
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - include/svx sd/source svx/source sw/source
include/svx/nbdtmg.hxx |1
sd/source/ui/func/fuolbull.cxx | 16 +
sd/source/ui/view/drtxtob1.cxx | 15 +---
sd/source/ui/view/drviewsf.cxx |3 -
svx/source/sidebar/nbdtmg.cxx |2 -
sw/source/uibase/shells/textsh1.cxx |2 -
sw/source/uibase/shells/txtnum.cxx | 61 +++-
7 files changed, 32 insertions(+), 68 deletions(-)
New commits:
commit 7f04fe1bba2c91055a90174bb85d7b2edf830dee
Author: Maxim Monastirsky
Date: Mon Jun 15 23:23:10 2015 +0300
tdf#91001 Fix inc/dec font for complex selections
By "complex selection" I mean:
1. Selection with an empty paragraph that has a bullet.
2. Selection that has different font sizes.
This is a regression of
5b32d9c4406a68507ac9737ee0ada8bd1d424815 that tried to
fix tdf#61492. In reality in order to fix that, it seems
to be enough to pass an empty SfxItemSet, because what we
really need is to invalidate the bullet width (by setting
it to -1), thus force recalculation, and this occurs
anyway.
Change-Id: I92545192f8c78ef7f1d66d72f0d8e8f256f87604
(cherry picked from commit 2a05cb81d363cce181d3e31967cea2cfff1bd06d)
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index f65ac7f..09a4a59 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -396,19 +396,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV,
pFontList, mpView );
if( pOLV )
-{
-SfxItemSet aSet( pOLV->GetEditView().GetAttribs() );
-SfxItemSet aNewAttrs
(pOLV->GetEditView().GetEmptyItemSet() );
-
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
-
-mpView->SetAttributes( aNewAttrs );
-}
-Invalidate();
-// to refresh preview (in outline mode), slot has to be
invalidated:
-mpViewShell->GetViewFrame()->GetBindings().Invalidate(
SID_PREVIEW_STATE, true, false );
+pOLV->SetAttribs( pOLV->GetEditView().GetEmptyItemSet() );
+mpViewShell->GetViewFrame()->GetBindings().Invalidate(
SID_ATTR_CHAR_FONTHEIGHT );
}
rReq.Done();
}
commit d8b1b4b085088487837ef6ffd0dc4580b2acbb12
Author: Maxim Monastirsky
Date: Wed Jun 10 15:15:56 2015 +0300
tdf#88290 Adapt the numbering popup to more than 8 items
The items count of NumberingTypeMgr is limited by 8, but
some languages have more items, so remove that limitation.
Also fix the behavior of the 10th item. The old sidebar
popup had a "None" item, whose id was 10 (defined by
DEFAULT_NONE from include/svx/nbdtmg.hxx), and that causes
now the 10th item to behave as on/off toggle. Since we
don't have a "None" item anymore, get rid of that behavior
completely.
Change-Id: I5546ca637f9951cc093a7bbf8fda11dc35341d4e
(cherry picked from commit 71b35212265bb93b10ca35ab964a36e6b6cc552b)
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 7695e5c..d400a87 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -27,7 +27,6 @@
namespace svx { namespace sidebar {
#define DEFAULT_BULLET_TYPES8
-#define DEFAULT_NONE10
#define DEFAULT_NUM_VALUSET_COUNT 8
#define DEFAULT_NUMBERING_CACHE_FORMAT_VERSION 0x10
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 2ee2ddb..bbee427 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -182,17 +182,12 @@ void
FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
sal_uInt16 nIdx = pItem->GetValue();
bool bToggle = false;
-bool bSwitchOff = false;
if( nIdx == (sal_uInt16)0x )
{
// If the nIdx is (sal_uInt16)0x, means set bullet status to on/off
nIdx = 1;
bToggle = true;
}
-else if (nIdx == DEFAULT_NONE)
-{
-bSwitchOff = true;
-}
nIdx--;
sal_uInt32 nNumItemId = SID_ATTR_NUMBERING_RULE;
@@ -266,18 +261,11 @@ void
FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
if ( pOLV )
{
-if ( bSwitchOff )
-{
-pOLV->SwitchOffBulletsNumbering( true );
-}
-else
-{
-pOLV->ToggleBulletsNumbering( bToggle, nSId == FN_SVX_SET_BULLET,
bInMasterView ? 0 : pNumRule );
-}
+pOLV->ToggleBulletsNumbering( bToggle, nSId == FN_SVX_SET_BULLET,
bInMasterView ?
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/UAccCOM/AccEditableText.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 888098ef0d26b80d36e464c14b2f6bb440d30f4e Author: Andrea Gelmini Date: Mon Jun 15 12:18:28 2015 +0200 Remove reference to AccessibleTextImpl.java The file: infra\accessibility\bridge\org\openoffice\java\accessibility\AccessibleTextImpl.java was deleted on commit 130833f80e89774269108cf30b2d1155a00354ce Change-Id: I8cecee3f55fd472f0ff13a14ff9db9acc26cd6ac Reviewed-on: https://gerrit.libreoffice.org/16296 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx index f5d0d8e..e7e23aa 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.cxx +++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx @@ -253,7 +253,6 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B /** * Convert attributes string to Any type. - * Reference to infra\accessibility\bridge\org\openoffice\java\accessibility\AccessibleTextImpl.java * * @param ouName the string of attribute name. * @param ouValue the string of attribute value. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 3 commits - svx/source svx/uiconfig
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 135 -- svx/source/sidebar/paragraph/ParaPropertyPanel.hxx |8 svx/uiconfig/ui/sidebarparagraph.ui| 272 ++--- 3 files changed, 137 insertions(+), 278 deletions(-) New commits: commit 8ca4e26a693986ae198c2182102aacbb399c91f2 Author: Maxim Monastirsky Date: Mon Jun 15 10:36:15 2015 +0300 Related: tdf#87651 Swap buttons and align to the right Change-Id: I74d799f10d4a1d88256c683f913b8c639d2694c1 (cherry picked from commit 4331aa3cbab9ea7505e1d31ac674ee8ca5d9c314) diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 0d71cb7..e3175ab 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -650,10 +650,10 @@ True False - + True False -.uno:OutlineLeft +.uno:OutlineRight True @@ -662,10 +662,10 @@ - + True False -.uno:OutlineRight +.uno:OutlineLeft True @@ -674,10 +674,10 @@ - + True False -.uno:OutlineUp +.uno:OutlineDown True @@ -686,10 +686,10 @@ - + True False -.uno:OutlineDown +.uno:OutlineUp True @@ -701,6 +701,7 @@ False True +end 1 commit 5ea3e979216fee5b9ceb6c42b2770d32bde0ae16 Author: Maxim Monastirsky Date: Wed Jun 10 13:48:49 2015 +0300 tdf#87651 Add outline buttons to impress sidebar Change-Id: Id3cf58660bfcaf7424d027773894ce6888df788a (cherry picked from commit ef530d397b021a9606bb3b3abe8c2290a1d94c59) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index c26d4ec..6555b92 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -151,6 +151,8 @@ void ParaPropertyPanel::HandleContextChange ( default: break; } + +mpTBxOutline->Show( maContext.GetApplication_DI() == sfx2::sidebar::EnumContext::Application_DrawImpress ); } void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent) @@ -597,6 +599,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, //NumBullet&Backcolor get(mpTBxNumBullet, "numberbullet"); get(mpTBxBackColor, "backgroundcolor"); +get(mpTBxOutline, "outline"); //Paragraph spacing get(mpTopDist, "aboveparaspacing"); mpTopDist->set_width_request(mpTopDist->get_preferred_size().Width()); @@ -624,6 +627,7 @@ void ParaPropertyPanel::dispose() mpTBxVertAlign.clear(); mpTBxNumBullet.clear(); mpTBxBackColor.clear(); +mpTBxOutline.clear(); mpTopDist.clear(); mpBottomDist.clear(); mpTbxIndent_IncDec.clear(); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 0e98775..5d82886 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -78,6 +78,7 @@ private: VclPtrmpTBxVertAlign; //NumBullet&Backcolor VclPtrmpTBxNumBullet; +VclPtrmpTBxOutline; VclPtrmpTBxBackColor; //Paragraph spacing VclPtr mpTopDist; diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 4b4897f..0d71cb7 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -59,32 +59,6 @@ - -True -False -True -Paragraph Background Color -end - - -105 -True -False -.uno:BackgroundColor -True - - -False -True - - - - -1 -1 - - - True False @@ -639,6
Fwd: Call for papers: send your proposals!
Message transféré Sujet : Call for papers: send your proposals! Date : Tue, 16 Jun 2015 11:16:49 +0200 De : Sophie Pour : proje...@global.libreoffice.org , LibreOffice-l10n , des...@global.libreoffice.org , libo-marketing-p...@lists.documentfoundation.org Hi all, This is a reminder that the call for papers is still running. Please share your knowledge, achievements, ideas with the community, we are very interested to hear you! You have the choice between a presentation of 45 mn or one of 20 mn including questions and answers. You'll find all the details here: http://conference.libreoffice.org/2015/call-for-papers/ Don't hesitate to come back to me if you have any question or need help with your travel and accommodations. Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org GSM: +33683901545 IRC: sophi Co-founder - Release coordinator The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basctl/source comphelper/qa connectivity/source dbaccess/source editeng/source embeddedobj/source forms/source framework/source include/comphelper include/drawinglayer
basctl/source/basicide/baside2.cxx |2 +-
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java |4 ++--
connectivity/source/drivers/ado/AKeys.cxx |2 +-
dbaccess/source/filter/xml/xmlfilter.hxx |2 +-
dbaccess/source/ui/browser/sbagrid.cxx |4 ++--
editeng/source/items/textitem.cxx |2 +-
embeddedobj/source/msole/olepersist.cxx|2 +-
forms/source/component/DatabaseForm.cxx|2 +-
forms/source/component/FormattedField.cxx |2 +-
forms/source/xforms/model.hxx |2 +-
forms/source/xforms/submission/submission_get.cxx |2 +-
framework/source/inc/loadenv/loadenv.hxx |4 ++--
include/comphelper/unique_disposing_ptr.hxx|2 +-
include/drawinglayer/primitive2d/controlprimitive2d.hxx|2 +-
include/editeng/frmdir.hxx |2 +-
include/rtl/bootstrap.hxx |2 +-
include/sfx2/msg.hxx |2 +-
include/svtools/toolpanel/drawerlayouter.hxx |2 +-
include/svx/svdsnpv.hxx|2 +-
lotuswordpro/source/filter/lwpgrfobj.cxx |2 +-
sc/qa/unit/ucalc.cxx |2 +-
sc/source/filter/inc/autofilterbuffer.hxx |2 +-
sc/source/ui/inc/drawview.hxx |2 +-
sc/source/ui/inc/impex.hxx |2 +-
sd/source/ui/inc/OutlineView.hxx |2 +-
sd/source/ui/unoidl/unosrch.cxx|2 +-
sd/source/ui/view/drawview.cxx |2 +-
sfx2/source/appl/sfxhelp.cxx |2 +-
sfx2/source/dialog/backingwindow.cxx |2 +-
sot/source/sdstor/stgdir.hxx |2 +-
starmath/source/visitors.cxx |2 +-
svx/source/form/fmobj.cxx |2 +-
svx/source/svdraw/svddrgmt.cxx |2 +-
sw/source/core/layout/frmtool.cxx |2 +-
sw/source/filter/html/htmlform.cxx |2 +-
sw/source/filter/ww8/ww8scan.cxx |2 +-
sw/source/ui/index/swuiidxmrk.cxx |2 +-
sw/source/uibase/inc/formatclipboard.hxx |2 +-
unotools/source/i18n/localedatawrapper.cxx |2 +-
vcl/source/gdi/pdfwriter_impl.cxx |2 +-
vcl/source/gdi/textlayout.cxx |2 +-
vcl/workben/svptest.cxx|2 +-
xmloff/source/text/txtparai.cxx|2 +-
43 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 3fa7b0b70f8f21c65603aa2b7db53392fdbceec4
Author: Andrea Gelmini
Date: Tue Jun 16 13:16:03 2015 +0200
Fix typos
Change-Id: Id8c7cf460cba5af89891c470e1aaa61b227d356e
Reviewed-on: https://gerrit.libreoffice.org/16310
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index d602a74..3e5effa 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -744,7 +744,7 @@ void ModulWindow::EditMacro( const OUString& rMacroName )
TextSelection aSel( TextPaM( nStart, 0 ), TextPaM( nStart, 0 )
);
AssertValidEditEngine();
TextView * pView = GetEditView();
-// scroll if applicabel so that first line is at the top
+// scroll if applicable so that first line is at the top
long nVisHeight = GetOutputSizePixel().Height();
if ( (long)pView->GetTextEngine()->GetTextHeight() >
nVisHeight )
{
diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
index 9167b09..4a1e147 100644
--- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
+++ b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
@@ -116,7 +116,7 @@ public class SequenceOutputStreamUnitTest
xSeekableInStream.closeInput ();
m_aTestHelper.Message ( "Both streams closed." );
[Libreoffice-commits] core.git: dbaccess/source drawinglayer/source extensions/source filter/source fpicker/source framework/source include/svx sc/source sd/source sfx2/source slideshow/source svl/sou
dbaccess/source/ui/misc/UITools.cxx|2 +-
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +-
extensions/source/bibliography/datman.cxx |2 +-
filter/source/config/cache/typedetection.hxx |2 +-
fpicker/source/office/iodlg.cxx|4 ++--
framework/source/dispatch/closedispatcher.cxx |2 +-
include/svx/svdhdl.hxx |2 +-
sc/source/ui/dbgui/validate.cxx|2 +-
sc/source/ui/docshell/docsh2.cxx |2 +-
sd/source/ui/dlg/animobjs.cxx |2 +-
sd/source/ui/func/fudraw.cxx |2 +-
sfx2/source/dialog/templdlg.cxx|2 +-
slideshow/source/inc/animationnodefactory.hxx |2 +-
svl/source/numbers/zforfind.hxx|2 +-
svtools/source/uno/contextmenuhelper.cxx |2 +-
svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx |2 +-
vcl/source/outdev/transparent.cxx |2 +-
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx|2 +-
18 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 814af9f1e59d1a76473b2c72cae4ba8afe1c52d4
Author: Andrea Gelmini
Date: Tue Jun 16 12:20:56 2015 +0200
Fix typos
Change-Id: Icfb885b72d51edc886851cf503c56fa12b8f559f
Reviewed-on: https://gerrit.libreoffice.org/16309
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 2b15eae..37c57f6 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1136,7 +1136,7 @@ namespace
return bRet;
}
-} // annonymous
+} // anonymous
::com::sun::star::util::URL createHelpAgentURL(const OUString& _sModuleName,
const OString& sHelpId)
{
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index dd200ab..6a4da36 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -691,7 +691,7 @@ namespace drawinglayer
the rectangle data is added directly by the GraphicsExporter as
comment. Does not need
to be adapted at once.
When adapting later, the only user - the diashow - should directly
use the provided
-Anination infos in the appropriate primitives (e.g.
AnimatedSwitchPrimitive2D)
+Animation infos in the appropriate primitives (e.g.
AnimatedSwitchPrimitive2D)
PRNSPOOL_TRANSPARENTBITMAP_BEGIN, PRNSPOOL_TRANSPARENTBITMAP_END
VCL usage when printing PL -> THB. Okay, THB confirms that it is
only used as
diff --git a/extensions/source/bibliography/datman.cxx
b/extensions/source/bibliography/datman.cxx
index a1fc5b8..44c8c9a 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1392,7 +1392,7 @@ Reference< awt::XControlModel >
BibDataManager::loadControlModel(
// in the current scenario, we insert a control model into a form.
This results in the control model
// adding itself as load listener to the form. Now, the form
should realize that it's already loaded
// and notify the model (which it knows as XLoadListener only)
immediately. This seems to make sense.
-// (as an anologon to the XStatusListener semantics).
+// (as an analogon to the XStatusListener semantics).
//
// But this would be way too risky for this last-day fix here.
Reference< XLoadable > xLoad( m_xForm, UNO_QUERY );
diff --git a/filter/source/config/cache/typedetection.hxx
b/filter/source/config/cache/typedetection.hxx
index b06d151..d9c6a63b 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -271,7 +271,7 @@ private:
-/** @short remove anythimng related to a TYPE/FILTER entry from the
+/** @short remove anything related to a TYPE/FILTER entry from the
specified MediaDescriptor.
@descr This method works together with
impl_validateAndSetTypeOnDescriptor()/
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 451d5ba..9f43429 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -946,11 +946,11 @@ IMPL_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
// check if it is a folder
bool bIsFolder = false;
-// first thing before doing anyhing with the content: Reset it. When the
user presses "open" (or "save" or "export",
+// first thing before doing anything with the conten
[Libreoffice-commits] core.git: basic/source bridges/source chart2/source connectivity/source desktop/source drawinglayer/source editeng/source framework/source include/canvas include/comphelper inclu
basic/source/classes/sb.cxx |2 +-
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 +-
chart2/source/view/axes/VCartesianAxis.cxx|2 +-
connectivity/source/drivers/macab/MacabResultSet.cxx |2 +-
desktop/source/deployment/registry/package/dp_package.cxx |2 +-
drawinglayer/source/primitive2d/metafileprimitive2d.cxx |2 +-
editeng/source/editeng/impedit4.cxx |2 +-
framework/source/helper/persistentwindowstate.cxx |2 +-
framework/source/services/desktop.cxx |6 +++---
include/canvas/base/canvascustomspritehelper.hxx |2 +-
include/canvas/canvastools.hxx|2 +-
include/comphelper/serviceinfohelper.hxx |2 +-
include/dbaccess/controllerframe.hxx |2 +-
include/oox/ole/vbaproject.hxx|2 +-
include/unotools/viewoptions.hxx |4 ++--
include/vcl/settings.hxx |2 +-
oox/source/dump/dumperbase.cxx|2 +-
sc/source/core/data/column.cxx|2 +-
sc/source/core/data/document.cxx |2 +-
sc/source/core/data/dptabsrc.cxx |2 +-
sc/source/core/data/patattr.cxx |2 +-
scripting/source/provider/BrowseNodeFactoryImpl.cxx |2 +-
sd/source/ui/view/ToolBarManager.cxx |2 +-
slideshow/source/inc/eventmultiplexer.hxx |4 ++--
svtools/source/uno/unoiface.cxx |2 +-
svx/source/form/navigatortree.cxx |2 +-
sw/source/core/text/EnhancedPDFExportHelper.cxx |2 +-
sw/source/core/text/itrcrsr.cxx |2 +-
sw/source/core/text/txthyph.cxx |2 +-
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/ww8par.cxx |2 +-
xmloff/source/text/txtfldi.cxx|2 +-
32 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit f378e723d2dbcbdeb65d7843c095d70d0bb7e0e0
Author: Andrea Gelmini
Date: Mon Jun 15 19:44:53 2015 +0200
Fix typos
Change-Id: I528752dfabeb31d14c350f79819b521537ab9b56
Reviewed-on: https://gerrit.libreoffice.org/16300
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index cd22751..e449e82 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1752,7 +1752,7 @@ bool StarBASIC::RTError( SbError code, const OUString&
rMsg, sal_Int32 l, sal_In
{
// very confusing, even though MakeErrorText sets up the error text
// seems that this is not used ( if rMsg already has content )
-// In the case of VBA MakeErrorText also formats the error to be
alittle more
+// In the case of VBA MakeErrorText also formats the error to be a
little more
// like vba ( adds an error number etc )
if ( SbiRuntime::isVBAEnabled() && ( code == SbERR_BASIC_COMPAT ) )
{
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index f95a045..a5ceb6a 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -609,7 +609,7 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw ()
// 2.Pass: Get the total needed memory for class ExceptionType
// (with embedded type_info) and keep the sizes for each instance
-// is stored in alloced int array
+// is stored in allocated int array
int *excecptionTypeSizeArray = new int[nLen];
nLen = 0;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 90f5880..85461bf 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1132,7 +1132,7 @@ void VCartesianAxis::get2DAxisMainLine(
B2DVector& rStart, B2DVector& rEnd, AxisLabelAlignment& rAlignment, double
fCrossesOtherAxis ) const
{
//m_aAxisProperties might get updated and changed here because
-//the label alignmant and inner direction sign depends exactly of the
choice of the axis line position which is made here in this method
+//the label alignment and inner direction sign depends exactly of the
choice of the axis line position which is made here in this method
double fMinX = m_pPosHelper->getLogicMinX();
double fMinY = m_pPosHelper->getLogicMinY();
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx
b/connectivity/source/drivers/macab/MacabResultSet.cxx
index a9d98fb..c125af2 100644
--- a/connecti
[Libreoffice-commits] core.git: basic/source chart2/source desktop/source forms/source framework/source include/drawinglayer include/sax include/svx oox/source sal/osl sfx2/source starmath/source svx/
basic/source/comp/io.cxx |2 +-
chart2/source/view/axes/Tickmarks.hxx |2 +-
desktop/source/app/app.cxx|2 +-
desktop/source/deployment/manager/dp_extensionmanager.cxx |2 +-
forms/source/component/FormComponent.cxx |2 +-
framework/source/uielement/menubarmanager.cxx |2 +-
include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx |2 +-
include/drawinglayer/primitive2d/primitivetools2d.hxx |4
++--
include/sax/tools/converter.hxx |2 +-
include/svx/fmgridcl.hxx |2 +-
oox/source/ole/vbainputstream.cxx |2 +-
sal/osl/w32/file_dirvol.cxx |2 +-
sfx2/source/dialog/backingcomp.cxx|4
++--
starmath/source/node.cxx |2 +-
svx/source/form/filtnav.cxx |2 +-
svx/source/xoutdev/xtabdash.cxx |2 +-
sw/qa/extras/inc/swmodeltestbase.hxx |2 +-
sw/source/core/layout/flycnt.cxx |2 +-
sw/source/core/layout/objectformattertxtfrm.cxx |2 +-
sw/source/core/layout/wsfrm.cxx |2 +-
sw/source/core/text/txtftn.cxx|2 +-
sw/source/filter/basflt/fltshell.cxx |2 +-
sw/source/filter/ww8/ww8scan.hxx |2 +-
sw/source/filter/xml/xmltble.cxx |2 +-
ucb/source/ucp/webdav/SerfSession.cxx |2 +-
vcl/source/edit/texteng.cxx |2 +-
vcl/source/gdi/sallayout.cxx |2 +-
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |2 +-
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |4
++--
xmlsecurity/source/xmlsec/nss/secerror.cxx|2 +-
30 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit ca9de688c2c263c51dca1cbbf2892e3b419f921e
Author: Andrea Gelmini
Date: Sun Jun 14 23:55:35 2015 +0200
Fix typos
Change-Id: I549635318f46718042e50c8f89ce3c620cade990
Reviewed-on: https://gerrit.libreoffice.org/16281
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 484bcea..d1dd481 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -165,7 +165,7 @@ void SbiParser::Input()
aGen.Gen( _CHAN0 );
}
-// OPEN stringexpr FOR mode ACCCESS access mode AS Channel [Len=n]
+// OPEN stringexpr FOR mode ACCESS access mode AS Channel [Len=n]
void SbiParser::Open()
{
diff --git a/chart2/source/view/axes/Tickmarks.hxx
b/chart2/source/view/axes/Tickmarks.hxx
index 3be50f6..52542ad 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -146,7 +146,7 @@ private: //member
::basegfx::B2DVectorm_aAxisStartScreenPosition2D;
::basegfx::B2DVectorm_aAxisEndScreenPosition2D;
-//labels might be posioned high or low on the border of the diagram far
away from the axis
+//labels might be positioned high or low on the border of the diagram far
away from the axis
//add this vector to go from the axis line to the label line (border of
the diagram)
::basegfx::B2DVectorm_aAxisLineToLabelLineShift;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 43cb227..bba9292 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1895,7 +1895,7 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl)
return 0;
}
-// enable acceptos
+// enable acceptors
IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl)
{
enableAcceptors();
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 5aed75e..cfaf2bc 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -692,7 +692,7 @@ Reference
ExtensionManager::addExtension(
bool bUserDisabled = false;
// In this guarded section (getMutex) we must not use the argument
xCmdEnv
// because it may bring up dialogs (XInteractionHandler::handle) this
-// may potententially deadlock. See issue
+// may potentially deadlock. See issue
// http://qa.openoffice.org/issues/show_bug.c
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit edb1582c4aec8948872aeca46e4a2703768f3c55 Author: Tor Lillqvist Date: Tue Jun 16 14:03:12 2015 +0300 Look for SDKs 9.0 and 8.4, too Change-Id: I9cfb2f2a456ab64ffd12c2a4a2a0bfe65507a05e diff --git a/configure.ac b/configure.ac index 74b0977..ae350a8 100644 --- a/configure.ac +++ b/configure.ac @@ -3029,7 +3029,7 @@ if test $_os = iOS; then xcode_developer=`xcode-select -print-path` current_sdk_ver=8.3 -for sdkver in 8.3 8.2 8.1 8.0; do +for sdkver in 9.0 8.4 8.3 8.2 8.1 8.0; do t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk if test -d $t; then ios_sdk=$sdkver ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source chart2/source connectivity/source cui/source dbaccess/source desktop/source drawinglayer/source filter/source forms/source framework/source include/comph
basegfx/source/polygon/b2dpolygoncutandtouch.cxx|2 +-
chart2/source/tools/AxisHelper.cxx |2 +-
chart2/source/view/charttypes/Splines.cxx |2 +-
connectivity/source/drivers/mozab/MDriver.cxx |2 +-
cui/source/options/treeopt.cxx |2 +-
dbaccess/source/ui/inc/UserAdminDlg.hxx |2 +-
desktop/source/deployment/manager/dp_manager.cxx|2 +-
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |2 +-
filter/source/msfilter/svdfppt.cxx |2 +-
forms/source/xforms/propertysetbase.cxx |2 +-
framework/source/layoutmanager/layoutmanager.cxx|2 +-
include/comphelper/weakeventlistener.hxx|2 +-
include/framework/actiontriggerhelper.hxx |2 +-
include/svx/AccessibleTextHelper.hxx|2 +-
include/svx/svdundo.hxx |2 +-
include/toolkit/controls/unocontrols.hxx|2 +-
include/ucbhelper/contenthelper.hxx |2 +-
include/unotools/configvaluecontainer.hxx |2 +-
include/xmloff/prhdlfac.hxx |2 +-
sc/qa/unit/subsequent_export-test.cxx |2 +-
sc/source/filter/inc/xetable.hxx|4 ++--
sc/source/ui/vba/vbachart.cxx |2 +-
sd/source/core/stlsheet.cxx |2 +-
sd/source/filter/eppt/eppt.cxx |4 ++--
sd/source/ui/sidebar/MasterPageDescriptor.cxx |2 +-
sfx2/source/appl/app.cxx|2 +-
slideshow/source/engine/animationfactory.cxx|2 +-
slideshow/source/engine/slideshowimpl.cxx |2 +-
starmath/source/node.cxx|2 +-
starmath/source/parse.cxx |2 +-
svtools/source/control/toolbarmenu.cxx |2 +-
svx/source/form/dataaccessdescriptor.cxx|2 +-
svx/source/form/fmtextcontrolshell.cxx |2 +-
svx/source/form/navigatortreemodel.cxx |2 +-
svx/source/sdr/contact/objectcontactofpageview.cxx |2 +-
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |2 +-
sw/inc/IDocumentFieldsAccess.hxx|2 +-
sw/inc/docsh.hxx|2 +-
sw/inc/swtable.hxx |2 +-
sw/source/core/inc/rootfrm.hxx |2 +-
sw/source/core/layout/dbg_lay.cxx |2 +-
sw/source/core/layout/ftnfrm.cxx|2 +-
sw/source/core/text/txtfrm.cxx |2 +-
sw/source/core/view/pagepreviewlayout.cxx |2 +-
sw/source/filter/ww8/docxsdrexport.cxx |2 +-
sw/source/ui/fldui/flddinf.cxx |2 +-
sw/source/uibase/app/docshini.cxx |2 +-
vbahelper/source/vbahelper/vbahelper.cxx|2 +-
vcl/inc/unx/wmadaptor.hxx |2 +-
vcl/source/control/ilstbox.cxx |2 +-
vcl/source/window/accmgr.cxx|2 +-
vcl/source/window/toolbox.cxx |2 +-
52 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 01532b1ab8f34ac0a87c17efaa2e6c7e9ac29b3b
Author: Andrea Gelmini
Date: Mon Jun 15 17:03:57 2015 +0200
Fix typos
Change-Id: I28cfc629dc3d6ef54128615452667ccce86c1072
Reviewed-on: https://gerrit.libreoffice.org/16297
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 5bb23ad..6a4370a 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -174,7 +174,7 @@ namespace basegfx
const temporaryPointVector& rPointVector, const B2DPolygon&
rPolygon,
sal_uInt32 nInd, temporaryPointVector& rTempPoints)
{
-// assuming that the subdivision to create rPolygon used
aequidistant pieces
+// assuming that the subdivision to create rPolygon used
equidistant pieces
// (as in adaptiveSubdivideByCount) it is now possible to
calculate back the
// cut positions in the polygon to relative cut positions on the
original bezier
// segment.
diff --git a/chart2/source/tools/AxisHelper.cxx
b/chart2/source/tools/AxisHelper.cxx
index 045ba71..ae9c58e 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -258,7 +258,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
[Libreoffice-commits] core.git: basctl/source cui/source dbaccess/source desktop/source include/drawinglayer include/jvmfwk odk/docs sc/source sd/source sfx2/source starmath/source svl/source svx/sour
basctl/source/basicide/macrodlg.cxx |2 +-
cui/source/options/optaboutconfig.cxx |2 +-
dbaccess/source/ui/querydesign/QueryDesignView.cxx |2 +-
desktop/source/offacc/acceptor.cxx |2 +-
include/drawinglayer/processor2d/hittestprocessor2d.hxx |2 +-
include/jvmfwk/framework.h |2 +-
odk/docs/tools.html |2 +-
sc/source/core/data/conditio.cxx|2 +-
sc/source/ui/view/formatsh.cxx |2 +-
sc/source/ui/view/viewfunc.cxx |2 +-
sd/source/ui/dlg/dlgass.cxx |2 +-
sfx2/source/dialog/splitwin.cxx |2 +-
starmath/source/cursor.cxx |2 +-
svl/source/numbers/zforfind.hxx |2 +-
svx/source/sdr/properties/measureproperties.cxx |2 +-
svx/source/unodraw/unoshape.cxx |2 +-
sw/source/core/unocore/unochart.cxx |2 +-
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx |2 +-
toolkit/source/controls/controlmodelcontainerbase.cxx |2 +-
ucb/source/ucp/package/pkgcontent.cxx |2 +-
unodevtools/source/skeletonmaker/skeletonmaker.cxx |2 +-
vcl/source/control/tabctrl.cxx |2 +-
vcl/win/source/window/salframe.cxx |2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
xmlsecurity/source/helper/xsecctl.cxx |2 +-
25 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 9b7e1bf43dcb25acabc15fb2bfb30e2a1dd249df
Author: Andrea Gelmini
Date: Mon Jun 15 12:17:57 2015 +0200
Fix typos
Change-Id: Ieaf67cf597e05dbae5affa153af907fda4462a41
Reviewed-on: https://gerrit.libreoffice.org/16295
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index 9c34023..1d06e96 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno;
MacroChooser::MacroChooser( vcl::Window* pParnt, bool bCreateEntries )
: SfxModalDialog(pParnt, "BasicMacroDialog",
"modules/BasicIDE/ui/basicmacrodialog.ui")
, bNewDelIsDel(true)
-// the Sfx doesn't aske the BasicManger whether modified or not
+// the Sfx doesn't ask the BasicManger whether modified or not
// => start saving in case of a change without a into the BasicIDE.
, bForceStoreBasic(false)
, nMode(All)
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 9b4481b..ea0e707 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -450,7 +450,7 @@ void CuiAboutConfigTabPage::AddToModifiedVector( const
boost::shared_ptr< Prop_I
{
if( rProp->Name == m_vectorOfModified[nInd]->Name && rProp->Property
== m_vectorOfModified[nInd]->Property )
{
-//property modified before. assing reference to the modified value
+//property modified before. Assign reference to the modified value
//do your changes on this object. They will be saved later.
m_vectorOfModified[nInd] = rProp;
isModifiedBefore = true;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 4c687b0..a101bd8 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2898,7 +2898,7 @@ OUString OQueryDesignView::getStatement()
bUseAlias = bUseAlias || !xMeta->supportsGroupByUnrelated();
aSqlCmd.append(GenerateGroupBy(this,rFieldList,bUseAlias));
-// - construct GroupBy and attachen
+// - construct GroupBy and attach
if(!aHavingStr.isEmpty())
{
aSqlCmd.append(" HAVING ");
diff --git a/desktop/source/offacc/acceptor.cxx
b/desktop/source/offacc/acceptor.cxx
index a7491b8e..7378033 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -139,7 +139,7 @@ void Acceptor::initialize( const Sequence& aArguments )
// arg count
int nArgs = aArguments.getLength();
-// not yet initialized and acceptstring
+// not yet initialized and accept-string
if (!m_bInit && nArgs > 0 && (aArguments[0] >>= m_aAcceptString))
{
SAL_INFO( "desktop.offacc", "Acceptor::initialize string=" <<
m_aAcceptString );
diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index 2b6419d..66bd119 100644
--- a/include/drawinglayer/processor2d/hittes
Re: PyUNO usability improvements
On 14.06.2015 15:26, Matthew J. Francis wrote: > Hi, > > For the past few weeks I've been working on some upgrades to PyUNO, > which have now reached (what I hope is) a sufficient level of sanity and > stability. I've pushed the changes to: wow, this all looks really nice! > 2. Cell ranges > == > > A custom behaviour is applied to objects which implement > com::sun::star::table::XCellRange to allow their cells and cell > ranges to be addressed by subscript, in the style of a Python list > or dict (read-only). This is applicable to Calc spreadsheet sheets, > Writer text tables and cell ranges created upon these. > cell = cellrange[0,0] # Access cell by indices > rng = cellrange[0,1:2] # Access cell range by index,slice > rng = cellrange[1:2,0] # Access cell range by slice,index > rng = cellrange[0:1,2:3]# Access cell range by slices > rng = cellrange['A1:B2']# Access cell range by descriptor > rng = cellrange['Name'] # Access cell range by name > > Note that the indices used are in Python/C order, and differ from > the arguments to methods provided by XCellRange. > - The statement cellrange[r,c], which returns the cell from row r > and column c, is equivalent to calling > XCellRange::getCellByPosition(c,r) > - The statement cellrange[t:b,l:r], which returns a cell range > covering rows t to b(non-inclusive) and columns l to r(non- > inclusive), is equivalent to calling > XCellRange::getCellRangeByPosition(l,t,r-1,b-1). i'm not sure if using a different order for row and column here is a good idea or a bad idea. maybe some Calc developer has an opinion on it? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: soltools/cpp
soltools/cpp/_tokens.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6149c5c8352d1e5c45568b5551539175f5305d4d Author: Stephan Bergmann Date: Tue Jun 16 12:24:01 2015 +0200 -fsanitize=nonnull-attribute Change-Id: Id214fb1f0decd4d39684a846c06ff97d8baa209d diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c index e31ccbd..c764886 100644 --- a/soltools/cpp/_tokens.c +++ b/soltools/cpp/_tokens.c @@ -295,7 +295,8 @@ void size_t nby; nby = (char *) str->lp - (char *) str->bp; -memmove(dtr->tp, str->bp, nby); +if (nby) +memmove(dtr->tp, str->bp, nby); } /* ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/gsoc15-online-update'
New branch 'feature/gsoc15-online-update' available with the following commits: commit f2af33318a8fca642391e66fccc10956e10377c4 Author: Jan Holesovsky Date: Tue Jun 16 11:12:17 2015 +0200 mar: MAR-based online update - initial import from Mozilla. changeset: 248917:ce863f9d8864 The following locations in the Mozzila sources were copied: firefox/modules/libmar -> online-update/source/libmar firefox/toolkit/mozapps/update -> online-update/source/update JavaScript parts were omitted. Change-Id: I0c92dc0bf734bfd5d8746822f674e162d64fa62f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glew
external/glew/ExternalProject_glew.mk |4
external/glew/glew-vc2013-project.patch.1 | 1194 +-
2 files changed, 1027 insertions(+), 171 deletions(-)
New commits:
commit 2b079c439c73cbf0224858829380b38881ec3979
Author: Tor Lillqvist
Date: Tue Jun 16 12:55:05 2015 +0300
For Windows build also glewinfo
Change-Id: I315f93030d8e2fe11bb31be532511ccc0a65b57d
diff --git a/external/glew/ExternalProject_glew.mk
b/external/glew/ExternalProject_glew.mk
index 714972c..4403a4e 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -18,6 +18,10 @@ $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
+ ,$(if $(filter 120,$(VCVER)),build/vc12,build/vc10)) \
+ $(call gb_ExternalProject_run,build,\
+ msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter
80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
,$(if $(filter 120,$(VCVER)),build/vc12,build/vc10))
else
diff --git a/external/glew/glew-vc2013-project.patch.1
b/external/glew/glew-vc2013-project.patch.1
index f56769c..b013c1e 100644
--- a/external/glew/glew-vc2013-project.patch.1
+++ b/external/glew/glew-vc2013-project.patch.1
@@ -32,6 +32,409 @@
+
+
--- /dev/null
glew/build/vc12/glew_static.vcxproj
+@@ -0,0 +1,400 @@
++
++http://schemas.microsoft.com/developer/msbuild/2003";>
++
++
++ Debug MX
++ Win32
++
++
++ Debug MX
++ x64
++
++
++ Debug
++ Win32
++
++
++ Debug
++ x64
++
++
++ Release MX
++ Win32
++
++
++ Release MX
++ x64
++
++
++ Release
++ Win32
++
++
++ Release
++ x64
++
++
++
++
++
++{664E6F0D-6784-4760-9565-D54F8EB1EDF4}
++
++
++
++Application
++
++
++Application
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++StaticLibrary
++false
++v120
++MultiByte
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32mxsd
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32mxsd
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32s
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32s
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32mxs
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32mxs
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32sd
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++glew32sd
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++
++
++$(LIB_DIR)\$(Configuration)\$(PlatformName)\
++tmp\$(TargetName)\$(Configuration)\$(PlatformName)\
++
++
++
++ MultiThreadedDebugDLL
++ Default
++ false
++ Disabled
++ true
++ Level3
++
../../include;%(AdditionalIncludeDirectories)
++
WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions)
++ EnableFastChecks
++
++
++ 0x0409
++
_DEBUG;GLEW_MX;GLEW_STATIC;%(PreprocessorDefinitions)
++
++
++ true
++
++
++ true
++ $(OutDir)$(TargetName)$(TargetExt)
++ MachineX86
++
++
++
++
++ MultiThreadedDeb
[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 42 commits - bridges/source chart2/source compilerplugins/clang connectivity/source cui/source dbaccess/source desktop/Library_s
Rebased ref, commits from common ancestor:
commit 103b619401f06697255167c788192601e87758b9
Author: Caolán McNamara
Date: Tue Jun 16 10:12:12 2015 +0100
fix 176 unbalanced XML_f xlsx export failuires
regression from
commit beb8e2830dc9e1c771e196fcaf08cdfd6bf3dde3
Author: yogesh.bharate001
Date: Tue Jun 2 16:39:09 2015 +0530
tdf#61908:XLSX formula cell range is not exported for MMULT.
Change-Id: Ia54ce5ce437e592378fe930b779c518de9670995
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 38bb673..02a9d91 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -932,6 +932,7 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
// OOXTODO: XML_cm, XML_vm, XML_ph
FSEND );
+bool bTagStarted = false;
ScAddress aScPos( static_cast< SCCOL >( GetXclPos().mnCol ), static_cast<
SCROW >( GetXclPos().mnRow ), rStrm.GetRoot().GetCurrScTab() );
if ( mrScFmlaCell.GetMatrixFlag() == MM_FORMULA)
@@ -973,9 +974,10 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
// OOXTODO: XML_si, uint
// OOXTODO: XML_bx bool
FSEND );
+bTagStarted = true;
}
}
-else
+if (!bTagStarted)
{
rWorksheet->startElement( XML_f,
XML_aca,XclXmlUtils::ToPsz( (mxTokArr &&
mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile()) ),
commit 9dcd2d119ab67bde9de588c42db3805525d5f06a
Author: Miklos Vajna
Date: Tue Jun 16 11:34:36 2015 +0200
lokdocview: couple for missing static_cast()
Change-Id: I038c05c0d081f52e4ac90688f73397565413632d
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index f4e1b77..9e8cabb 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -519,10 +519,7 @@ callback (gpointer pData)
break;
case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
{
-g_info ("%d %d", priv->m_nDocumentWidthTwips,
priv->m_nDocumentHeightTwips);
-g_info ("startin");
payloadToSize(pCallback->m_aPayload.c_str(),
priv->m_nDocumentWidthTwips, priv->m_nDocumentHeightTwips);
-g_info ("%d %d", priv->m_nDocumentWidthTwips,
priv->m_nDocumentHeightTwips);
gtk_widget_set_size_request(GTK_WIDGET(pDocView),
twipToPixel(priv->m_nDocumentWidthTwips,
priv->m_fZoom),
twipToPixel(priv->m_nDocumentHeightTwips,
priv->m_fZoom));
@@ -1156,7 +1153,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Document Path",
"The URI of the document to open",
0,
- G_PARAM_READWRITE));
+ static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:editable:
@@ -1169,7 +1166,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Editable",
"Whether the content is in edit mode or not",
FALSE,
- G_PARAM_READWRITE));
+ static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:load-progress:
@@ -1214,7 +1211,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Is Loading",
"Whether the view is loading a document",
FALSE,
- G_PARAM_READABLE));
+ static_cast(G_PARAM_READABLE)));
/**
* LOKDocView:doc-width:
@@ -1227,7 +1224,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Document Width",
"Width of the document in twips",
0, G_MAXLONG, 0,
-G_PARAM_READWRITE));
+static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:doc-height:
@@ -1240,7 +1237,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Document Height",
"Height of the document in twips",
0, G_MAXLONG, 0,
-G_PARAM_READWRITE));
+static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:can-zoom-in:
commit 23ca7d8a81df74d7195d2d8916f77c6305fc8a94
Author: Pranav Kant
Date: Fri Jun 12 19:48:37 2015 +0530
Superfluous block; lets merge into one
Change-Id: I2f49394c53deece8e86a7f290250c4f52918c5d8
diff --git a/libreofficekit/Module_libreofficekit.mk
b/libreofficekit/Module_lib
[GSOC] week 3 report
Week 3 was geared towards a lot of testing and minor tweaks for the previous patches to get them merged for the next release. I prioritized some of the enhancement requests - 1. Styles tab addition to the sidebar for writer - https://gerrit.libreoffice.org/#/c/16279/ 2. #91802 >From the previous week, I have completed the work on sidebar PosSize section but the design looked a bit ugly for the writer. So, currently I am working on creating a different sidebar tab for writer. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
On Tue, 2015-06-16 at 07:58 +, Crashtest VM wrote: > New crashtest update available at > http://dev-builds.libreoffice.org/crashtest/d7763d97fe836c013f2026a79f33e49a6b507efc/ Big spike in xlsx exports (and other ooxml formats with embedded spreadsheets). I believe I've fixed it with http://cgit.freedesktop.org/libreoffice/core/commit/?id=103b619401f06697255167c788192601e87758b9 calc reviewers welcome to double-check that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xetable.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 103b619401f06697255167c788192601e87758b9
Author: Caolán McNamara
Date: Tue Jun 16 10:12:12 2015 +0100
fix 176 unbalanced XML_f xlsx export failuires
regression from
commit beb8e2830dc9e1c771e196fcaf08cdfd6bf3dde3
Author: yogesh.bharate001
Date: Tue Jun 2 16:39:09 2015 +0530
tdf#61908:XLSX formula cell range is not exported for MMULT.
Change-Id: Ia54ce5ce437e592378fe930b779c518de9670995
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 38bb673..02a9d91 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -932,6 +932,7 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
// OOXTODO: XML_cm, XML_vm, XML_ph
FSEND );
+bool bTagStarted = false;
ScAddress aScPos( static_cast< SCCOL >( GetXclPos().mnCol ), static_cast<
SCROW >( GetXclPos().mnRow ), rStrm.GetRoot().GetCurrScTab() );
if ( mrScFmlaCell.GetMatrixFlag() == MM_FORMULA)
@@ -973,9 +974,10 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
// OOXTODO: XML_si, uint
// OOXTODO: XML_bx bool
FSEND );
+bTagStarted = true;
}
}
-else
+if (!bTagStarted)
{
rWorksheet->startElement( XML_f,
XML_aca,XclXmlUtils::ToPsz( (mxTokArr &&
mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile()) ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/source
libreofficekit/source/gtk/lokdocview.cxx | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 9dcd2d119ab67bde9de588c42db3805525d5f06a
Author: Miklos Vajna
Date: Tue Jun 16 11:34:36 2015 +0200
lokdocview: couple for missing static_cast()
Change-Id: I038c05c0d081f52e4ac90688f73397565413632d
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index f4e1b77..9e8cabb 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -519,10 +519,7 @@ callback (gpointer pData)
break;
case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
{
-g_info ("%d %d", priv->m_nDocumentWidthTwips,
priv->m_nDocumentHeightTwips);
-g_info ("startin");
payloadToSize(pCallback->m_aPayload.c_str(),
priv->m_nDocumentWidthTwips, priv->m_nDocumentHeightTwips);
-g_info ("%d %d", priv->m_nDocumentWidthTwips,
priv->m_nDocumentHeightTwips);
gtk_widget_set_size_request(GTK_WIDGET(pDocView),
twipToPixel(priv->m_nDocumentWidthTwips,
priv->m_fZoom),
twipToPixel(priv->m_nDocumentHeightTwips,
priv->m_fZoom));
@@ -1156,7 +1153,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Document Path",
"The URI of the document to open",
0,
- G_PARAM_READWRITE));
+ static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:editable:
@@ -1169,7 +1166,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Editable",
"Whether the content is in edit mode or not",
FALSE,
- G_PARAM_READWRITE));
+ static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:load-progress:
@@ -1214,7 +1211,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Is Loading",
"Whether the view is loading a document",
FALSE,
- G_PARAM_READABLE));
+ static_cast(G_PARAM_READABLE)));
/**
* LOKDocView:doc-width:
@@ -1227,7 +1224,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Document Width",
"Width of the document in twips",
0, G_MAXLONG, 0,
-G_PARAM_READWRITE));
+static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:doc-height:
@@ -1240,7 +1237,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
"Document Height",
"Height of the document in twips",
0, G_MAXLONG, 0,
-G_PARAM_READWRITE));
+static_cast(G_PARAM_READWRITE)));
/**
* LOKDocView:can-zoom-in:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/LibreOfficeKit libreofficekit/Module_libreofficekit.mk libreofficekit/qa libreofficekit/source
include/LibreOfficeKit/LibreOfficeKitGtk.h | 17
libreofficekit/Module_libreofficekit.mk |3
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |4
libreofficekit/source/gtk/lokdocview.cxx| 1858 +++-
4 files changed, 1042 insertions(+), 840 deletions(-)
New commits:
commit 23ca7d8a81df74d7195d2d8916f77c6305fc8a94
Author: Pranav Kant
Date: Fri Jun 12 19:48:37 2015 +0530
Superfluous block; lets merge into one
Change-Id: I2f49394c53deece8e86a7f290250c4f52918c5d8
diff --git a/libreofficekit/Module_libreofficekit.mk
b/libreofficekit/Module_libreofficekit.mk
index 217ecb2..0b2fd4a 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -19,9 +19,6 @@ ifneq ($(ENABLE_GTK3),)
$(eval $(call gb_Module_add_targets,libreofficekit,\
Library_libreofficekitgtk \
Executable_gtktiledviewer \
-))
-
-$(eval $(call gb_Module_add_targets,libreofficekit,\
Executable_tilebench \
))
endif # ($(ENABLE_GTK3),)
commit 3061e486f9f9313c15cba6782edfaee96fe4f83d
Author: Pranav Kant
Date: Thu Jun 11 22:00:11 2015 +0530
lokdocview: Restructure this GObject class
This is a big messy commit restructuring the whole class to follow most
common practices followed by standard GObject classes, so that it can
keep gobject-introspection happy; hence, allowing this widget to be used
from other languages.
Change-Id: I10c34dad402d1ec586958b2db21ff44412c36cea
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index bdd2e9a..7048dbe 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -25,23 +25,19 @@ G_BEGIN_DECLS
#define LOK_IS_DOC_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),
LOK_TYPE_DOC_VIEW))
#define LOK_DOC_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
LOK_TYPE_DOC_VIEW, LOKDocViewClass))
-
-typedef struct _LOKDocView LOKDocView;
-typedef struct _LOKDocViewClass LOKDocViewClass;
+typedef struct _LOKDocViewLOKDocView;
+typedef struct _LOKDocViewClass LOKDocViewClass;
+typedef struct _LOKDocViewPrivate LOKDocViewPrivate;
struct _LOKDocView
{
GtkDrawingArea aDrawingArea;
-struct LOKDocView_Impl* m_pImpl;
+LOKDocViewPrivate* priv;
};
struct _LOKDocViewClass
{
GtkDrawingAreaClass parent_class;
-void (* edit_changed) (LOKDocView* pView, gboolean was_edit);
-void (* command_changed) (LOKDocView* pView, char* new_state);
-void (* search_not_found) (LOKDocView* pView, char* new_state);
-void (* part_changed) (LOKDocView* pView, int new_part);
};
GType lok_doc_view_get_type (void)
G_GNUC_CONST;
@@ -78,9 +74,8 @@ void lok_doc_view_post_command
(LOKDocView*
const
char* pArguments);
/// Posts a keyboard event to LibreOfficeKit.
-void lok_doc_view_post_key (GtkWidget*
pWidget,
-
GdkEventKey* pEvent,
-gpointer
pData);
+void lok_doc_view_post_key
(LOKDocView* pDocView,
+GdkEvent*
pEvent);
float lok_doc_view_pixel_to_twip
(LOKDocView* pDocView,
float
fInput);
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 580d5f6..8b00679 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -145,12 +145,12 @@ static void getVisibleAreaTwips(GdkRectangle* pArea)
/// Handles the key-press-event of the window.
-static gboolean signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointer
pData)
+static gboolean signalKey(GtkWidget* /*pWidget*/, GdkEvent* pEvent, gpointer/*
pData*/)
{
LOKDocView* pLOKDocView = LOK_DOC_VIEW(pDocView);
if (!gtk_widget_get_visible(pFindbar) &&
bool(lok_doc_view_get_edit(pLOKDocView)))
{
-lok_doc_view_post_key(pWidget, pEvent, pData);
+lok_doc_view_post_key(pLOKDocView, pEvent);
return TRUE;
}
return FALSE;
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index ca7996f..f4e1b77 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -32,30 +32,34 @@
#endif
// Cursor bitmaps from the Android app.
-#define CURSOR_HANDLE_DIR "android/source/res/drawable/"
+#define CURSOR_HANDLE_DIR "/android/source/res/drawable/"
// Numbe
[Libreoffice-commits] core.git: officecfg/registry svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 29 ++
svx/Library_svx.mk |1
svx/UIConfig_svx.mk |1
svx/source/sidebar/PanelFactory.cxx |5
svx/source/sidebar/styles/StylesPropertyPanel.cxx| 55 +
svx/source/sidebar/styles/StylesPropertyPanel.hxx| 52
svx/uiconfig/ui/sidebarstylespanel.ui| 118 +++
7 files changed, 260 insertions(+), 1 deletion(-)
New commits:
commit e436f31147c7eb75908a8750b0e4053c2efdca5b
Author: Rishabh Kumar
Date: Mon Jun 15 01:54:43 2015 +0530
tdf#73071:Styles tab addition to the sidebar for writer
Addition of .uno:StyleApply , .uno:StyleUpdateByExample and
.uno:StyleNewByExample uno commands to the sidebar
Change-Id: Iab6f1fb465066fce523fd376038a059189f1b842
Reviewed-on: https://gerrit.libreoffice.org/16279
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 3f9e93e..9a40006 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -231,6 +231,33 @@
+
+
+ Styles
+
+
+ StylesPropertyPanel
+
+
+ PropertyDeck
+
+
+
+WriterVariants, Annotation, visible;
+WriterVariants, DrawText, visible;
+WriterVariants, Table, visible;
+WriterVariants, Text, visible;
+WriterVariants, default,visible;
+
+
+
+
private:resource/toolpanel/SvxPanelFactory/StylesPropertyPanel
+
+
+ 100
+
+
+
Character
@@ -270,7 +297,7 @@
private:resource/toolpanel/SvxPanelFactory/TextPropertyPanel
- 100
+ 120
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index db5ab90..7cc76cb 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -182,6 +182,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/sidebar/text/TextUnderlineControl \
svx/source/sidebar/text/TextUnderlinePopup \
svx/source/sidebar/text/TextPropertyPanel \
+svx/source/sidebar/styles/StylesPropertyPanel \
svx/source/sidebar/paragraph/ParaLineSpacingControl \
svx/source/sidebar/paragraph/ParaLineSpacingPopup \
svx/source/sidebar/paragraph/ParaPropertyPanel \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f4e1f9f..ba19a9c 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/sidebarline \
svx/uiconfig/ui/sidebarparagraph \
svx/uiconfig/ui/sidebarpossize \
+svx/uiconfig/ui/sidebarstylespanel \
svx/uiconfig/ui/sidebartextpanel \
svx/uiconfig/ui/textcontrolchardialog \
svx/uiconfig/ui/textcontrolparadialog \
diff --git a/svx/source/sidebar/PanelFactory.cxx
b/svx/source/sidebar/PanelFactory.cxx
index bab0a12..a89b9e0 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -18,6 +18,7 @@
*/
#include "text/TextPropertyPanel.hxx"
+#include "styles/StylesPropertyPanel.hxx"
#include "paragraph/ParaPropertyPanel.hxx"
#include "area/AreaPropertyPanel.hxx"
#include "graphic/GraphicPropertyPanel.hxx"
@@ -144,6 +145,10 @@ Reference SAL_CALL
PanelFactory::createUIElement (
{
pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings,
aContext);
}
+else if (rsResourceURL.endsWith("/StylesPropertyPanel"))
+{
+pControl = StylesPropertyPanel::Create(pParentWindow, xFrame,
pBindings);
+}
else if (rsResourceURL.endsWith("/ParaPropertyPanel"))
{
pControl = ParaPropertyPanel::Create(pParentWindow, xFrame, pBindings,
xSidebar);
diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx
b/svx/source/sidebar/styles/StylesPropertyPanel.cxx
new file mode 100644
index 000..12190ca
--- /dev/null
+++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx
@@ -0,0 +1,55 @@
+#include "StylesPropertyPanel.hxx"
+#include
+
+using namespace css;
+using namespace css::uno;
+
+namespace svx { namespace sidebar {
+
+VclPtr StylesPropertyPanel::Create (
+vcl::Window* pParent,
+const css::uno::Reference& rxFrame,
+SfxBindings* pBindings)
+{
+if (pParent == NULL)
+throw lang::IllegalArgumentException("no parent Window given to
StylesPropertyPanel::Create", NULL, 0);
[GSoC] Haskell UNO Language Binding - Weekly Report 3
Hi, The past week I've been working on making objects available to the Haskell code, and how to work with UNO exceptions on the Haskell side. I didn't find a solution yet, having tried two or three different methods. This week, the idea is to choose one of the methods, and try to make a binding to test with new examples (previous examples were all hardcoded). Kind regards, Jorge ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source
sfx2/source/appl/appopen.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 527496750bbead21f33766d6ec0aba02a2380ab2
Author: Caolán McNamara
Date: Tue Jun 16 09:29:39 2015 +0100
Resolves: tdf#88911 Crash when dragging unsupported url to navigator pane
Change-Id: I9d4fc8e3edac699c8543ab9dce8d0e35bbf40e5b
(cherry picked from commit 9ef671364ff9fbb552a5433053af9283d12d90c7)
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 4793874..bdba6e2 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -1112,10 +1112,14 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq
)
}
}
-if ( pLinkItem )
+if (pLinkItem)
{
-SfxPoolItem* pRet = rReq.GetReturnValue()->Clone();
-pLinkItem->GetValue().Call(pRet);
+const SfxPoolItem* pRetValue = rReq.GetReturnValue();
+if (pRetValue)
+{
+SfxPoolItem* pClone = pRetValue->Clone();
+pLinkItem->GetValue().Call(pClone);
+}
delete pLinkItem;
}
}
___
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' - 16/278da3713c7afb504c1e8fccd18268ece2ae64
16/278da3713c7afb504c1e8fccd18268ece2ae64 |1 + 1 file changed, 1 insertion(+) New commits: commit 24e9a8f46a2b1f325244124abc369699e906e442 Author: Caolán McNamara Date: Tue Jun 16 09:31:56 2015 +0100 Notes added by 'git notes add' diff --git a/16/278da3713c7afb504c1e8fccd18268ece2ae64 b/16/278da3713c7afb504c1e8fccd18268ece2ae64 new file mode 100644 index 000..a5eab02 --- /dev/null +++ b/16/278da3713c7afb504c1e8fccd18268ece2ae64 @@ -0,0 +1 @@ +prefer: 41de10f5fd181dc45b487d2ac29cd2b4fbb34710 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sfx2/source sw/source vcl/source
sfx2/source/appl/appopen.cxx| 10 -
sfx2/source/sidebar/ResourceManager.cxx |2 -
sw/source/uibase/utlui/navipi.cxx | 56 +---
vcl/source/window/toolbox.cxx |4 +-
4 files changed, 40 insertions(+), 32 deletions(-)
New commits:
commit 9ef671364ff9fbb552a5433053af9283d12d90c7
Author: Caolán McNamara
Date: Tue Jun 16 09:29:39 2015 +0100
Resolves: tdf#88911 Crash when dragging unsupported url to navigator pane
Change-Id: I9d4fc8e3edac699c8543ab9dce8d0e35bbf40e5b
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e27754e..4ac17df 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -1112,10 +1112,14 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq
)
}
}
-if ( pLinkItem )
+if (pLinkItem)
{
-SfxPoolItem* pRet = rReq.GetReturnValue()->Clone();
-pLinkItem->GetValue().Call(pRet);
+const SfxPoolItem* pRetValue = rReq.GetReturnValue();
+if (pRetValue)
+{
+SfxPoolItem* pClone = pRetValue->Clone();
+pLinkItem->GetValue().Call(pClone);
+}
delete pLinkItem;
}
}
commit 115fdccd6d69348203375edb3bb262dbc2088a8a
Author: Caolán McNamara
Date: Mon Jun 15 21:07:24 2015 +0100
unfold the if statements a bit, no logic change
Change-Id: I079ba61ef1a559054221029e1c6aa4e53d7be17a
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 2f19e1f..3fdbaa2 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1153,35 +1153,39 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const
ExecuteDropEvent& rEvt )
{
TransferableDataHelper aData( rEvt.maDropEvent.Transferable );
sal_Int8 nRet = DND_ACTION_NONE;
-OUString sFileName;
-if( !SwContentTree::IsInDrag() &&
-!(sFileName = SwNavigationPI::CreateDropFileName( aData )).isEmpty() )
+if(SwContentTree::IsInDrag())
+return nRet;
+
+OUString sFileName = SwNavigationPI::CreateDropFileName(aData);
+if (sFileName.isEmpty())
+return nRet;
+
+INetURLObject aTemp(sFileName);
+GraphicDescriptor aDesc(aTemp);
+if (aDesc.Detect()) // accept no graphics
+return nRet;
+
+if (-1 != sFileName.indexOf('#'))
+return nRet;
+
+if ((sContentFileName.isEmpty() || sContentFileName != sFileName))
{
-INetURLObject aTemp( sFileName );
-GraphicDescriptor aDesc( aTemp );
-if( !aDesc.Detect() ) // accept no graphics
+nRet = rEvt.mnAction;
+sFileName = comphelper::string::stripEnd(sFileName, 0);
+sContentFileName = sFileName;
+if(pxObjectShell)
{
-if( -1 == sFileName.indexOf('#')
-&& (sContentFileName.isEmpty() || sContentFileName !=
sFileName ))
-{
-nRet = rEvt.mnAction;
-sFileName = comphelper::string::stripEnd(sFileName, 0);
-sContentFileName = sFileName;
-if(pxObjectShell)
-{
-aContentTree->SetHiddenShell( 0 );
-(*pxObjectShell)->DoClose();
-DELETEZ( pxObjectShell);
-}
-SfxStringItem aFileItem(SID_FILE_NAME, sFileName );
-SfxStringItem aOptionsItem( SID_OPTIONS, OUString("HRC") );
-SfxLinkItem aLink( SID_DONELINK,
-LINK( this, SwNavigationPI, DoneLink ) );
-GetActiveView()->GetViewFrame()->GetDispatcher()->Execute(
-SID_OPENDOC, SfxCallMode::ASYNCHRON,
-&aFileItem, &aOptionsItem, &aLink, 0L );
-}
+aContentTree->SetHiddenShell( 0 );
+(*pxObjectShell)->DoClose();
+DELETEZ( pxObjectShell);
}
+SfxStringItem aFileItem(SID_FILE_NAME, sFileName );
+SfxStringItem aOptionsItem( SID_OPTIONS, OUString("HRC") );
+SfxLinkItem aLink( SID_DONELINK,
+LINK( this, SwNavigationPI, DoneLink ) );
+GetActiveView()->GetViewFrame()->GetDispatcher()->Execute(
+SID_OPENDOC, SfxCallMode::ASYNCHRON,
+&aFileItem, &aOptionsItem, &aLink, 0L );
}
return nRet;
}
commit c3db4d2298dd5b18695cf8fd0a56815af75ee9a1
Author: Caolán McNamara
Date: Mon Jun 15 17:29:17 2015 +0100
state *which* context name is not recognized
Change-Id: I179155364f0470b75f14f2ac7b675d76462a9635
diff --git a/sfx2/source/sidebar/ResourceManager.cxx
b/sfx2/source/sidebar/ResourceManager.cxx
index 2679a3e..1535675 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -390,7 +390,7 @@ void ResourceManager::ReadContextList (
const EnumContext::Context eContext
(EnumContext::GetContextEnum
[Libreoffice-commits] libmspub.git: 7 commits - configure.ac HACKING Makefile.am src/lib
HACKING|2 +-
Makefile.am|2 ++
configure.ac |1 +
src/lib/MSPUBCollector.cpp | 14 +++---
src/lib/MSPUBParser.cpp| 10 --
src/lib/MSPUBParser.h |1 +
src/lib/MSPUBParser2k.cpp | 11 +++
src/lib/MSPUBParser97.cpp |6 +-
src/lib/libmspub_utils.cpp | 31 +++
src/lib/libmspub_utils.h |2 ++
10 files changed, 65 insertions(+), 15 deletions(-)
New commits:
commit 9f5a58d13f14717b8d7f366bb525bc91f01bd6b4
Author: David Tardon
Date: Tue Jun 16 10:15:05 2015 +0200
avoid out-of-bounds access
Change-Id: I9e880dc3bdbf91f1d0d7bbca68d6188c6cc6da4e
diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp
index a6ae02b..7003b72 100644
--- a/src/lib/MSPUBParser2k.cpp
+++ b/src/lib/MSPUBParser2k.cpp
@@ -564,12 +564,15 @@ bool
MSPUBParser2k::parseGroup(librevenge::RVNGInputStream *input, unsigned seqN
bool retVal = true;
m_collector->beginGroup();
m_collector->setCurrentGroupSeqNum(seqNum);
- for (unsigned i = 0; i < m_chunkChildIndicesById[seqNum].size(); ++i)
+ if (seqNum < m_chunkChildIndicesById.size())
{
-const ContentChunkReference &childChunk =
m_contentChunks.at(m_chunkChildIndicesById[seqNum][i]);
-if (childChunk.type == SHAPE || childChunk.type == GROUP)
+for (unsigned i = 0; i < m_chunkChildIndicesById[seqNum].size(); ++i)
{
- retVal = retVal && parse2kShapeChunk(childChunk, input, page, false);
+ const ContentChunkReference &childChunk =
m_contentChunks.at(m_chunkChildIndicesById[seqNum][i]);
+ if (childChunk.type == SHAPE || childChunk.type == GROUP)
+ {
+retVal = retVal && parse2kShapeChunk(childChunk, input, page, false);
+ }
}
}
m_collector->endGroup();
commit 1da6f0a9782dca04e902ab5115116d74a2941199
Author: David Tardon
Date: Tue Jun 16 09:42:06 2015 +0200
avoid excessive allocation
Change-Id: Ia664a2d348022657376d5632d1fb087d656f2be2
diff --git a/src/lib/MSPUBParser97.cpp b/src/lib/MSPUBParser97.cpp
index 2fb8d6d..2d717e1 100644
--- a/src/lib/MSPUBParser97.cpp
+++ b/src/lib/MSPUBParser97.cpp
@@ -112,7 +112,7 @@ void
MSPUBParser97::parseContentsTextIfNecessary(librevenge::RVNGInputStream *in
}
const CharacterStyle &spanStyle = spanInfo.m_style;
std::vector spanChars;
-spanChars.reserve(spanEnd - currentSpanIndex);
+spanChars.reserve(std::min(spanEnd - currentSpanIndex, m_length));
for (unsigned i = currentSpanIndex; i < spanEnd; ++i)
{
unsigned char ch = textInfo.m_chars[i];
commit b3b438e4ab2536fdb65910c1ebee3d2a8c2a627c
Author: David Tardon
Date: Tue Jun 16 09:26:45 2015 +0200
avoid excessive allocation
Change-Id: Ibb7eaaf77d5f80510de81de217f8cb63682d9dce
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index bc6fef2..6b79243 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1134,7 +1135,7 @@ void MSPUBParser::parseFonts(librevenge::RVNGInputStream
*input, const QuillChun
void MSPUBParser::parseDefaultStyle(librevenge::RVNGInputStream *input, const
QuillChunkReference &chunk)
{
readU32(input);
- unsigned numElements = readU32(input);
+ unsigned numElements = std::min(readU32(input), m_length);
input->seek(input->tell() + 12, librevenge::RVNG_SEEK_SET);
std::vector offsets;
offsets.reserve(numElements);
commit 998c647c9002cc2e364cf862f2ff4dab540e6649
Author: David Tardon
Date: Tue Jun 16 09:38:15 2015 +0200
avoid excessive allocation
Change-Id: Ib136b3ad0bbdc75697dac0357a1afd17751cbbfd
diff --git a/src/lib/MSPUBParser97.cpp b/src/lib/MSPUBParser97.cpp
index 67db0a7..2fb8d6d 100644
--- a/src/lib/MSPUBParser97.cpp
+++ b/src/lib/MSPUBParser97.cpp
@@ -238,6 +238,7 @@ CharacterStyle MSPUBParser97::readCharacterStyle(
MSPUBParser97::TextInfo97
MSPUBParser97::getTextInfo(librevenge::RVNGInputStream *input, unsigned length)
{
+ length = std::min(length, m_length); // sanity check
std::vector chars;
chars.reserve(length);
std::vector paragraphEnds;
commit 06e845f157abb9dd207652e6553cab4ec6cef92d
Author: David Tardon
Date: Tue Jun 16 09:13:13 2015 +0200
keep the stream size around
Change-Id: Ib5e127b445233ea7b0c499afedd4295edfad33d2
diff --git a/configure.ac b/configure.ac
index 22aaac1..8c3883b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ AC_SUBST(ZLIB_LIBS)
AC_CHECK_HEADERS(
boost/bind.hpp \
boost/function.hpp \
+ boost/numeric/conversion/cast.hpp \
boost/optional.hpp \
boost/ptr_container/ptr_vector.hpp \
boost/scoped_ptr.hpp \
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index b680f71..bc6fef2 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -13,6 +13,9 @@
#inclu
Re: PyUNO usability improvements
On 06/16/2015 04:27 AM, Matthew J. Francis wrote: com.sun.star.registry.XRegistryKey com.sun.star.registry.XSimpleRegistry - Could be occasionally useful Entities in css.registry were tailor-made to match the legacy UNO types and services rdb format, a use which is rather deprecated (the legacy format only being used for extensions by now, mainly for backwards-compatibility reasons). And I doubt these entities will ever be re-used for something else. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - toolkit/source vcl/source
toolkit/source/awt/vclxtoolkit.cxx | 22 +-
vcl/source/app/svapp.cxx |3 ++-
2 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 4b73386f06f9cea4a23f7e0a0882540e3dd4aa0a
Author: Caolán McNamara
Date: Thu Jun 4 10:06:17 2015 +0100
Resolves: tdf#46440 SIGSEGV on toolkit bootstrap without running instance
(cherry picked from commit 3f69547397e5841d0915921be5be8b3edfdfdbc5)
Change-Id: I9a78a75b3d72586b1702ed6fa63bb0b62ce6cd72
Reviewed-on: https://gerrit.libreoffice.org/16078
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 680fc0c..4cc5873 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -44,6 +44,7 @@
#include
#include
+#include
#include
#include
#include
@@ -601,7 +602,26 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
{
osl_setThreadName("VCLXToolkit VCL main thread");
-VCLXToolkit * pTk = (VCLXToolkit *)pArgs;
+css::uno::Reference xServiceManager;
+try
+{
+xServiceManager = ::comphelper::getProcessServiceFactory();
+}
+catch (const css::uno::DeploymentException&)
+{
+}
+if (!xServiceManager.is())
+{
+css::uno::Reference xContext =
+::cppu::defaultBootstrap_InitialComponentContext();
+
+xServiceManager = css::uno::Reference(
+xContext->getServiceManager(), css::uno::UNO_QUERY_THROW );
+// set global process service factory used by unotools config helpers
+::comphelper::setProcessServiceFactory( xServiceManager );
+}
+
+VCLXToolkit * pTk = static_cast(pArgs);
bInitedByVCLToolkit = InitVCL();
if( bInitedByVCLToolkit )
{
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 8d99977..5ce9477 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -428,7 +428,8 @@ void Application::AcquireSolarMutex( sal_uLong nCount )
bool Application::IsInMain()
{
-return ImplGetSVData()->maAppData.mbInAppMain;
+ImplSVData* pSVData = ImplGetSVData();
+return pSVData ? pSVData->maAppData.mbInAppMain : false;
}
bool Application::IsInExecute()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/d7763d97fe836c013f2026a79f33e49a6b507efc/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/bin-skipping.rtf | 19 +++
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
writerfilter/source/rtftok/rtftokenizer.cxx |6 ++
3 files changed, 31 insertions(+)
New commits:
commit 63fbd90099098218994899ca7da3eb5e1656e4e7
Author: Thorsten Behrens
Date: Wed Jun 10 08:49:13 2015 +0200
rtf: skip binary data also in skip-group mode
Since there might be arbitrary rtf markup inside, we rather
shouldn't act upon.
Change-Id: Ia782d89cb4ce8f34df64a3e0cba16de2db7b7ccf
Reviewed-on: https://gerrit.libreoffice.org/16206
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/rtfimport/data/bin-skipping.rtf
b/sw/qa/extras/rtfimport/data/bin-skipping.rtf
new file mode 100644
index 000..4426074
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/bin-skipping.rtf
@@ -0,0 +1,19 @@
+{\rtf1\ansi\deff3\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New
Roman};}{\f4\fswiss\fprq2\fcharset0 Liberation Sans{\*\falt
Arial};}{\f5\fnil\fprq2\fcharset0 SimSun;}{\f6\fnil\fprq2\fcharset0 Droid Sans
Devanagari;}{\f7\fswiss\fprq0\fcharset128 Droid Sans Devanagari;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af5\langfe2052\dbch\af6\afs24\alang1081\loch\f3\fs24\lang1033
Normal;}
+{\s15\sbasedon0\snext16\sb240\sa120\keepn\dbch\af5\dbch\af6\afs28\loch\f4\fs28
Heading;}
+{\s16\sbasedon0\snext16\sl288\slmult1\sb0\sa140 Text Body;}
+{\s17\sbasedon16\snext17\sl288\slmult1\sb0\sa140\dbch\af7 List;}
+{\s18\sbasedon0\snext18\sb120\sa120\noline\i\dbch\af7\afs24\ai\fs24 Caption;}
+{\s19\sbasedon0\snext19\noline\dbch\af7 Index;}
+}
+\deftab709
+\viewscale100
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse451\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
Default Style;}}
+{\*\shprslt\bin24 }{\par MUST NOT IMPORT}}}
+\formshade\paperh15840\paperw12240\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+{\*\ftnsep\chftnsep}\pgndec\pard\plain
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af5\langfe2052\dbch\af6\afs24\alang1081\loch\f3\fs24\lang1033{\rtlch
\ltrch\loch
+text}
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 86dddfc..8171b6d 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2301,6 +2301,12 @@ DECLARE_RTFIMPORT_TEST(testTdf90315, "tdf90315.rtf")
CPPUNIT_ASSERT_EQUAL(static_cast(1270),
getProperty(xTextSection->getPropertyValue("TextColumns"),
"AutomaticDistance"));
}
+DECLARE_RTFIMPORT_TEST(testBinSkipping, "bin-skipping.rtf")
+{
+// before, it was importing '/nMUST NOT IMPORT'
+CPPUNIT_ASSERT_EQUAL(OUString("text"), getRun(getParagraph(1),
1)->getString());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx
b/writerfilter/source/rtftok/rtftokenizer.cxx
index 416c6bb..1a920c6 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -282,7 +282,13 @@ bool RTFTokenizer::lookupMathKeyword(RTFMathSymbol&
rSymbol)
RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int
nParam)
{
if (m_rImport.getDestination() == Destination::SKIP)
+{
+// skip binary data explicitely, to not trip over rtf markup
+// control characters
+if (rKeyword.equals("bin"))
+Strm().SeekRel(nParam);
return RTFError::OK;
+}
SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": keyword '\\" <<
rKeyword.getStr() <<
"' with param? " << (bParam ? 1 : 0) <<" param val: '" << (bParam
? nParam : 0) << "'");
RTFSymbol aSymbol;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: test infrastructure ideas appreciated ... -- automatically generated unit tests
On 06/15/2015 03:51 PM, Zolnai Tamás wrote: I've got an idea too: automatically generated unit tests. I think with a clang plugin we can generate unit tests for all class/struct in the source code in build time. Build system can link it as a simple unit test and run it directly after generation. If it returns with no error it can be removed. If it returns an error the test should be untouched to allow running it directly (without regeneration). These kind of tests gets in my mind now: - Create an object and remove it (check no problem with destruction) - Create and remove an object thousand of times (memory leak) - Copy operator and copy constructor result is equivalent (operator== is needed) - Copy an object, remove the original object (shallow copy) - Create a const object, call all const method on it and check it remains equal. - Getter and setter method: set a value and check the corresponding getter method returns with the same value -- Set values depending on the parameter type --- int: end points of the value range, negative value, 0, positive value --- string: empty string, dummy string, string with wild characters. I'm not sure how exciting an approach that is. Especially for the later part of your list, it builds on the assumption that an object is merely a conglomeration of public member functions, that can be called in arbitrary sequence and with arbitrary arguments, and that is often just not the case. The dreaded JunitTest_*_unoapi are modeled somewhat like that. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ffd7c4fd7bdc63098ec6ac746b9885f92964465 Author: Miklos Vajna Date: Tue Jun 16 09:10:02 2015 +0200 Repository.mk: libreofficekitgtk is conditional on ENABLE_GTK3 Change-Id: I97f859e33a510f626787cce335f652dc03546ab6 diff --git a/Repository.mk b/Repository.mk index 3e3fa85..aeb02ac 100644 --- a/Repository.mk +++ b/Repository.mk @@ -581,7 +581,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ i18nlangtag \ i18nutil \ index_data \ - $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), libreofficekitgtk) \ + $(if $(and $(ENABLE_GTK3), $(filter LINUX,$(OS))), libreofficekitgtk) \ localedata_en \ localedata_es \ localedata_euro \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a9cd014a23babba0530bf896c13bbadba84fa4df
Author: Miklos Vajna
Date: Tue Jun 16 09:01:53 2015 +0200
writerfilter: fix comment in DomainMapperTableHandler::endTable()
Change-Id: Ied04714a2221113769a97eebcdf8bfa5aadc2d50
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 9e13489..f98e023 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1121,7 +1121,7 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
m_rDMapper_Impl.m_aPendingFloatingTables.push_back(FloatingTableInfo(xStart,
xEnd, comphelper::containerToSequence(aFrameProperties), nTableWidth));
else
{
-// m_xText points to the body text, get to current xText from
m_rDMapper_Impl, in case e.g. we would be in a header.
+// m_xText points to the body text, get the current xText from
m_rDMapper_Impl, in case e.g. we would be in a header.
uno::Reference
xTextAppendAndConvert(m_rDMapper_Impl.GetTopTextAppend(), uno::UNO_QUERY);
if (xTextAppendAndConvert.is())
xTextAppendAndConvert->convertToTextFrame(xStart, xEnd,
comphelper::containerToSequence(aFrameProperties));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
