[Libreoffice-commits] core.git: vcl/source
vcl/source/app/svapp.cxx | 10 +-
vcl/source/image/ImplImageTree.cxx |5 +++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 8f6dd15dce1e6116947b512c89d802fccc0bd6f1
Author: Tarcísio Ladeia de Oliveira
AuthorDate: Sat Nov 26 16:55:27 2022 -0300
Commit: Noel Grandin
CommitDate: Thu Dec 8 09:51:30 2022 +
vcl: check for null device
The xmloff/draw test series was crashing soon after "testTextBoxLoss"
finished. Even though it finished successfully, CppUnitTest was crashing
when popping the protector. From the backtrace, the crash resulted from
attempts to access null pointers.
I do not know what caused those pointers to be null, but I added the
checks so that it could at least proceed to the other tests.
Change-Id: Ia0014a273142442a791a43fb9e3f75c2452bbd45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143332
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 6dfa35c61551..d2c6294917f0 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1165,7 +1165,15 @@ vcl::Window* Application::GetFocusWindow()
OutputDevice* Application::GetDefaultDevice()
{
-return ImplGetDefaultWindow()->GetOutDev();
+vcl::Window* pWindow = ImplGetDefaultWindow();
+if (pWindow != nullptr)
+{
+return pWindow->GetOutDev();
+}
+else
+{
+return nullptr;
+}
}
basegfx::SystemDependentDataManager&
Application::GetSystemDependentDataManager()
diff --git a/vcl/source/image/ImplImageTree.cxx
b/vcl/source/image/ImplImageTree.cxx
index 549d0739139b..bdd4fcedfda5 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -75,8 +75,9 @@ bool ImageRequestParameters::convertToDarkTheme()
sal_Int32 ImageRequestParameters::scalePercentage()
{
sal_Int32 aScalePercentage = 100;
-if (!(meFlags & ImageLoadFlags::IgnoreScalingFactor))
-aScalePercentage =
Application::GetDefaultDevice()->GetDPIScalePercentage();
+OutputDevice* pDevice = Application::GetDefaultDevice();
+if (!(meFlags & ImageLoadFlags::IgnoreScalingFactor) && pDevice != nullptr)
+aScalePercentage = pDevice->GetDPIScalePercentage();
else if (mnScalePercentage > 0)
aScalePercentage = mnScalePercentage;
return aScalePercentage;
[Libreoffice-commits] core.git: svx/qa
svx/qa/unit/core.cxx |4
svx/qa/unit/svdraw.cxx |4
2 files changed, 8 insertions(+)
New commits:
commit a468c06f384b8ad2fb1260d375844accb18db2dc
Author: Tarcísio Ladeia de Oliveira
AuthorDate: Mon Nov 21 23:14:20 2022 -0300
Commit: Xisco Fauli
CommitDate: Wed Nov 23 12:47:59 2022 +0100
svx/qa: add checks for PDFiumDocument pointer
When compiled without PDFium, two tests in svx were causing segmentation
faults, as they were trying to access null pointers. Add a check for the
pointer returned and end test if it is a nullptr (based on how it is done
in other tests).
Change-Id: Iab3c341a20f002adc92fac22ef76ed022aa49422
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143081
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/svx/qa/unit/core.cxx b/svx/qa/unit/core.cxx
index f834222ea009..a2976fd90eed 100644
--- a/svx/qa/unit/core.cxx
+++ b/svx/qa/unit/core.cxx
@@ -50,6 +50,10 @@ CPPUNIT_TEST_FIXTURE(Test, testChartExportToPdf)
// Without the accompanying fix in place, this test would have failed,
because the output was
// empty (0 bytes).
std::unique_ptr pPdfDocument = parsePDFExport();
+if (!pPdfDocument)
+{
+return;
+}
int nPageCount = pPdfDocument->getPageCount();
CPPUNIT_ASSERT_GREATER(0, nPageCount);
}
diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx
index c1c8bc435a9a..b20a08fe5092 100644
--- a/svx/qa/unit/svdraw.cxx
+++ b/svx/qa/unit/svdraw.cxx
@@ -498,6 +498,10 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testPageViewDrawLayerClip)
// Then make sure that line shape gets clipped:
std::unique_ptr pDoc = parsePDFExport();
+if (!pDoc)
+{
+return;
+}
std::unique_ptr pPage1 = pDoc->openPage(0);
CPPUNIT_ASSERT_EQUAL(3, pPage1->getObjectCount());
std::unique_ptr pPage2 = pDoc->openPage(1);
Tarcísio Ladeia de Oliveira license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
Re: Download speed for git clone
As per Sabyasachi Bhoi's suggestion, I've tried cloning from github instead of gerrit and download speed improved dramatically, from 90 to 600KBps. But this only works in my Windows user directory, not in C:/sources as in the Wiki tutorial for building libreoffice! I have no idea why the download speeds differ depending on directory! They're on the same physical drive. Anyway, problem solved, I guess. Thanks for the replies. Em dom., 22 de ago. de 2021 às 01:11, Sabya Bhoi escreveu: > Hi there! > I had the same problem when I tried cloning from Gerrit. Try cloning from > GitHub instead. It worked for me. > > Best, > Sabyasachi Bhoi > > On Sun, Aug 22, 2021, 9:31 AM Yuri de Albuquerque < > yuridealbuquer...@gmail.com> wrote: > >> Hello! I'm trying to build LibreOffice from source in order to learn how >> to contribute. I've managed to follow the instructions up to a certain >> point, but the clone command is taking way too long! The download speed >> never exceeds 90 KBps on the "Receiving objects" part. What is the download >> speed supposed to be? I'm on a Windows 10 machine and my connection >> supports up to 30MBps download. >> >
Download speed for git clone
Hello! I'm trying to build LibreOffice from source in order to learn how to contribute. I've managed to follow the instructions up to a certain point, but the clone command is taking way too long! The download speed never exceeds 90 KBps on the "Receiving objects" part. What is the download speed supposed to be? I'm on a Windows 10 machine and my connection supports up to 30MBps download.
Re: Avoid "JRE required" msg upon extension installation
Dear Mike, Le 25/12/2019 à 04:19, Kaganski Mike a écrit : You can't change anything in the extension to avoid this. This is tdf#120363 [1], and is fixed in LibreOffice 6.2. I was using Libreoffice 6.1.5 under Windows and Libreoffice 6.0.7 under Linux. I upgraded to LibreOffice 6.2.8 and the warning about Java doesn't show up any more when I install my extension. Thanks for your kind help (and thanks for the fix, because I saw you are the author of the fix !) Regards, -- Alexis de Lattre ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Avoid "JRE required" msg upon extension installation
I developed a LibreOffice Extension that contains a Python macro (and the required Python libs): https://github.com/akretion/factur-x-libreoffice-extension file "factur-x_macro.oxt" (source code in "extension/" subdir) But, when I add this extension to LibreOffice on a PC without Java installed, I get this error message: << LibreOffice requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now? >> If I answer "No", the extension will still work fine (because the extension doesn't need Java at all, it only contains a Python macro). So this message is wrong. Could I change something in my macro to avoid this message ? My extension targets users without IT background and they could be scared by that wrong message. Thanks in advance for your help, -- Alexis de Lattre ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreoffice converstion of egistrymodifications.xcu user items to systemwide xml registry share
Thank you Stpehan!! I created the /usr/lib/libreoffice/share/registry/data/ directory and addeded my registrymodifications-system-wide.xcu and this seems to work. Thank you very much for the right syntax and hints! Kind regards, Jelle de Jong - name: create /usr/lib/libreoffice/share/registry/data/ directory file: path: /usr/lib/libreoffice/share/registry/data/ state: directory when: ansible_distribution == 'Linuxmint' tags: libreoffice - name: copying registrymodifications-system-wide.xcu to /usr/lib/libreoffice/share/registry/data/ copy: src: registrymodifications-system-wide.xcu dest: /usr/lib/libreoffice/share/registry/data/registrymodifications-system-wide.xcu when: ansible_distribution == 'Linuxmint' tags: libreoffice On 12/04/2019 10:13, Stephan Bergmann wrote: On 11/04/2019 21:17, Jelle de Jong wrote: I am trying to convert changes to /home/$USER/.config/libreoffice/4/user/registrymodifications.xcu into systemwide configuration for users that start libreoffice for the first time under linux with systemwide settings. I tried placing a xml file in /usr/lib/libreoffice/share/registry/registrymodifications-system-wide.xcu but I can not seem to get the syntax right. Directly in share/registry/ the file would need to have .xcd extension and adhere to officecfg/registry/data.dtd. That means that those oor:path="..."> elements would not be supported, just the more tedious hierarchical ones (see officecfg/registry/component-update.dtd for details; seems I never came around to lifting the requirement that an .xcu nested inside an .xcd can only have an oor:component-data top-level element, not an oor:items one). However, the share/registry/ config layer also supports .xcu files in a data/ sub-dir, so similar to the hack of adding a share/registry/registrymodifications-system-wide.xcd you could use the hack of adding a share/registry/data/registrymodifications-system-wide.xcu into which you could easily copy-paste items from a registrymodifications.xcu: http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:oor="http://openoffice.org/2001/registry";> oor:name="WarnAlienFormat" oor:op="fuse">false oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']">oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse">MS Word 2007 XML oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']">oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse">Impress MS PowerPoint 2007 XML oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDocument']">oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse">Calc MS Excel 2007 XML (The non-hacky way, of course, is to create an .oxt LO extension that you install system-wide.) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:oor="http://openoffice.org/2001/registry";> false MS Word 2007 XML Impress MS PowerPoint 2007 XML Calc MS Excel 2007 XML ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
libreoffice converstion of egistrymodifications.xcu user items to systemwide xml registry share
Hello everybody, I am trying to convert changes to /home/$USER/.config/libreoffice/4/user/registrymodifications.xcu into systemwide configuration for users that start libreoffice for the first time under linux with systemwide settings. I tried placing a xml file in /usr/lib/libreoffice/share/registry/registrymodifications-system-wide.xcu but I can not seem to get the syntax right. I found the schema here, not sure how to use them to create my own configuration: https://cgit.freedesktop.org/libreoffice/core/tree/officecfg/registry/schema/org/openoffice Can somebody give me example for a system wide registrymodificaton or look at the attachments and help me out with these few settings. Kind regards and best wishes, Jelle de Jong (GNU/Linux Consultant) false MS Word 2007 XML Impress MS PowerPoint 2007 XML Calc MS Excel 2007 XML http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:oor="http://openoffice.org/2001/registry";> http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office"> MS Word 2007 XML Impress MS PowerPoint 2007 XML Calc MS Excel 2007 XML http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office"> false ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
libreoffice converstion of egistrymodifications.xcu user items to systemwide xml registry share
Hello everybody, I am trying to convert changes to /home/$USER/.config/libreoffice/4/user/registrymodifications.xcu into systemwide configuration for users that start libreoffice for the first time under linux with systemwide settings. I tried placing a xml file in /usr/lib/libreoffice/share/registry/registrymodifications-system-wide.xcu but I can not seem to get the syntax right. I found the schema here, not sure how to use them to create my own configuration: https://cgit.freedesktop.org/libreoffice/core/tree/officecfg/registry/schema/org/openoffice Can somebody give me example for a system wide registrymodificaton or look at the attachments and help me out with these few settings. Kind regards and best wishes, Jelle de Jong (GNU/Linux Consultant) false MS Word 2007 XML Impress MS PowerPoint 2007 XML Calc MS Excel 2007 XML http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:oor="http://openoffice.org/2001/registry";> http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office"> MS Word 2007 XML Impress MS PowerPoint 2007 XML Calc MS Excel 2007 XML http://openoffice.org/2004/installation"; oor:name="Common" oor:package="org.openoffice.Office"> false ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Paulo de Souza Lima - License statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. To the extent possible under law, I waive all copyright and related or neighboring rights to my past & future contributions to LibreOffice: http://creativecommons.org/publicdomain/zero/1.0 Paulo de Souza Lima http://almalivre.wordpress.com Lagoa Santa - MG Linux User #432358 Ubuntu User #28729 - *Onde há Consciência não há necessidade de leis.* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Manuel De Franceschi license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/qa
starmath/qa/cppunit/test_starmath.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 79a1ba61e4753758f66ba25b128aeff96ea716c9
Author: Marcos Paulo de Souza
Date: Mon Dec 28 20:03:24 2015 -0200
tdf#32062: Add test
Change-Id: I0af72c436c2eca6741bfaa6e6570ce74f486c112
Reviewed-on: https://gerrit.libreoffice.org/20996
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/starmath/qa/cppunit/test_starmath.cxx
b/starmath/qa/cppunit/test_starmath.cxx
index 27e64d7..91a14bd 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -45,12 +45,14 @@ public:
void editMarker();
void editFailure();
+void replacePlaceholder();
void viewZoom();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(editUndoRedo);
CPPUNIT_TEST(editMarker);
CPPUNIT_TEST(editFailure);
+CPPUNIT_TEST(replacePlaceholder);
CPPUNIT_TEST(viewZoom);
CPPUNIT_TEST_SUITE_END();
@@ -221,6 +223,17 @@ void Test::editUndoRedo()
}
+void Test::replacePlaceholder()
+{
+// Test the placeholder replacement. In this case, testing 'a + b', it
+// should return '+a + b' when selecting '+' in ElementsDock
+m_pEditWindow->SetText("a + b");
+m_pEditWindow->SelectAll();
+m_pEditWindow->InsertText("+");
+OUString sFinalText = m_pEditWindow->GetText();
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be '+a + b'", OUString("+a + b"),
sFinalText);
+}
+
void Test::viewZoom()
{
sal_uInt16 nOrigZoom, nNextZoom, nFinalZoom;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/edit.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit fc47ee6fbf67781acd07549c40a75c9272572085
Author: Marcos Paulo de Souza
Date: Tue Dec 15 18:37:04 2015 -0200
Fix tdf#32062: Math overwrites selected area when click on element
Change-Id: I42ce83d1647d054419dbf664dfbfb2bc1cd01338
Reviewed-on: https://gerrit.libreoffice.org/20729
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index f156ee6..11f0227 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -1026,6 +1026,11 @@ void SmEditWindow::InsertText(const OUString& rText)
// callers
OUString string(rText);
+OUString selected(pEditView->GetSelected());
+// if we have text selected, use it in the first placeholder
+if (!selected.isEmpty())
+string = string.replaceFirst("", selected);
+
// put a space before a new command if not in the beginning of a line
if (aSelection.nStartPos > 0 && aCurrentFormula[nStartIndex - 1] != '
')
string = " " + string;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry starmath/inc starmath/source starmath/uiconfig
officecfg/registry/schema/org/openoffice/Office/Math.xcs | 10 + starmath/inc/dialog.hxx |1 starmath/inc/starmath.hrc|1 starmath/source/cfgitem.cxx | 28 ++- starmath/source/cfgitem.hxx |2 + starmath/source/dialog.cxx |4 ++ starmath/source/document.cxx |1 starmath/source/edit.cxx |6 ++- starmath/source/smmod.cxx|1 starmath/source/unomodel.cxx |1 starmath/uiconfig/smath/ui/smathsettings.ui | 16 11 files changed, 69 insertions(+), 2 deletions(-) New commits: commit e2bfbfcb809329b9ed0bdd2fee14f343ca3603dd Author: Marcos Paulo de Souza Date: Mon Nov 2 21:43:24 2015 -0200 tdf#43090: Add option to disable auto close brackets As many users asked, now there is a checkbox inside Tools->Math called "Auto close brackets, parentheses and braces". This option is enabled by default, but can be turned off now. Change-Id: I6f96201c0720fb62fc2dce99222f97194e930fbe Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/19750 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs index 3b05a12..c89c779 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs @@ -329,6 +329,16 @@ true + + + + + + Auto close brackets, parentheses and braces when editing a formula. + Auto close brackets, parentheses and braces when editing a formula + +true + diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 16cf98d..4e7f374 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -61,6 +61,7 @@ class SmPrintOptionsTabPage : public SfxTabPage VclPtrm_pZoom; VclPtr m_pNoRightSpaces; VclPtr m_pSaveOnlyUsedSymbols; +VclPtr m_pAutoCloseBrackets; DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void); diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 9a64513..cefa6c5 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -75,6 +75,7 @@ #define SID_NO_RIGHT_SPACES (SID_SMA_START + 124) #define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125) #define SID_ELEMENTSDOCKINGWINDOW (SID_SMA_START + 126) +#define SID_AUTO_CLOSE_BRACKETS (SID_SMA_START + 127) #define RID_PRINTUIOPTIONS (RID_APP_START + 11) diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 858479d..d6c91b7 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -123,6 +123,7 @@ struct SmCfgOther boolbPrintFormulaText; boolbPrintFrame; boolbIsSaveOnlyUsedSymbols; +boolbIsAutoCloseBrackets; boolbIgnoreSpacesRight; boolbToolboxVisible; boolbAutoRedraw; @@ -139,7 +140,8 @@ SmCfgOther::SmCfgOther() bPrintTitle = bPrintFormulaText = bPrintFrame = bIgnoreSpacesRight = bToolboxVisible = bAutoRedraw = -bFormulaCursor = bIsSaveOnlyUsedSymbols = true; +bIsAutoCloseBrackets = bFormulaCursor += bIsSaveOnlyUsedSymbols = true; } @@ -780,6 +782,7 @@ void SmMathConfig::LoadOther() pOther->ePrintSize = static_cast(officecfg::Office::Math::Print::Size::get()); pOther->nPrintZoomFactor = officecfg::Office::Math::Print::ZoomFactor::get(); pOther->bIsSaveOnlyUsedSymbols = officecfg::Office::Math::LoadSave::IsSaveOnlyUsedSymbols::get(); +pOther->bIsAutoCloseBrackets = officecfg::Office::Math::Misc::AutoCloseBrackets::get(); pOther->bIgnoreSpacesRight = officecfg::Office::Math::Misc::IgnoreSpacesRight::get(); pOther->bToolboxVisible = officecfg::Office::Math::View::ToolboxVisible::get(); pOther->bAutoRedraw = officecfg::Office::Math::View::AutoRedraw::get(); @@ -801,6 +804,7 @@ void SmMathConfig::SaveOther() officecfg::Office::Math::Print::Size::set(pOther->ePrintSize, batch); officecfg::Office::Math::Print::ZoomFactor::set(pOther->nPrintZoomFactor, batch); officecfg::Office::Math::LoadSave::IsSaveOnlyUsedSymbols::set(pOther->bIsSaveOnlyUsedSymbols, batch); + officecfg::Office::Math::Misc::AutoCloseBrackets::set(pOther->bIsAutoCloseBrackets, batch); officecfg::Office::Math::Misc::IgnoreSpacesRight::set(pOther->bIgnoreSpacesRi
[Libreoffice-commits] core.git: oox/source sw/qa sw/source writerfilter/source
oox/source/drawingml/fillproperties.cxx | 30 ++
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |2 -
sw/source/filter/ww8/docxattributeoutput.cxx |2 -
writerfilter/source/dmapper/GraphicImport.cxx |5 +---
4 files changed, 21 insertions(+), 18 deletions(-)
New commits:
commit d151ed35ad4c4e7aa9fbb807930fcf91dea2eba7
Author: Joren De Cuyper
Date: Tue Jun 2 22:26:29 2015 +0200
tdf#87539 map MSO washout filter to LO's watermark colormode
Change-Id: Id28e301a74a729245b20ba6cd2adecf203633f0e
Reviewed-on: https://gerrit.libreoffice.org/16048
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 1302a07..6879896 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -696,17 +696,29 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
{
sal_Int16 nBrightness = getLimitedValue< sal_Int16, sal_Int32 >(
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
sal_Int16 nContrast = getLimitedValue< sal_Int16, sal_Int32 >(
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
+ColorMode eColorMode = ColorMode_STANDARD;
+
+switch( maBlipProps.moColorEffect.get( XML_TOKEN_INVALID ) )
+{
+case XML_biLevel: eColorMode = ColorMode_MONO;break;
+case XML_grayscl: eColorMode = ColorMode_GREYS; break;
+}
+
if( maBlipProps.mxGraphic.is() )
{
// created transformed graphic
Reference< XGraphic > xGraphic = lclCheckAndApplyDuotoneTransform(
maBlipProps, maBlipProps.mxGraphic, rGraphicHelper, nPhClr );
xGraphic = lclCheckAndApplyChangeColorTransform( maBlipProps,
xGraphic, rGraphicHelper, nPhClr );
-// MSO uses a different algorithm for contrast+brightness, LO applies
contrast before brightness,
-// while MSO apparently applies half of brightness before contrast and
half after. So if only
-// contrast or brightness need to be altered, the result is the same,
but if both are involved,
-// there's no way to map that, so just force a conversion of the image.
-if( nBrightness != 0 && nContrast != 0 )
+
+if (eColorMode == ColorMode_STANDARD && nBrightness == 70 && nContrast
== -70)
+// map MSO 'washout' to our Watermark colormode
+eColorMode = ColorMode_WATERMARK;
+else if( nBrightness != 0 && nContrast != 0 )
{
+// MSO uses a different algorithm for contrast+brightness, LO
applies contrast before brightness,
+// while MSO apparently applies half of brightness before contrast
and half after. So if only
+// contrast or brightness need to be altered, the result is the
same, but if both are involved,
+// there's no way to map that, so just force a conversion of the
image.
xGraphic = applyBrightnessContrast( xGraphic, nBrightness,
nContrast );
nBrightness = 0;
nContrast = 0;
@@ -738,14 +750,6 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
}
}
}
-
-// color effect
-ColorMode eColorMode = ColorMode_STANDARD;
-switch( maBlipProps.moColorEffect.get( XML_TOKEN_INVALID ) )
-{
-case XML_biLevel: eColorMode = ColorMode_MONO;break;
-case XML_grayscl: eColorMode = ColorMode_GREYS; break;
-}
rPropMap.setProperty(PROP_GraphicColorMode, eColorMode);
// brightness and contrast
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 47b47b8..727d448 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -973,7 +973,7 @@ DECLARE_OOXMLEXPORT_TEST(testPictureColormodeWatermark,
"picture_colormode_water
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum",
"bright", "5");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum",
"bright", "7");
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum",
"contrast", "-7");
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ddad776..710c862 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4246,7 +4246,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfN
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt |binary
sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx |binary
sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 30
++
sw/source/filter/ww8/docxattributeoutput.cxx| 19 +-
5 files changed, 47 insertions(+), 2 deletions(-)
New commits:
commit 0db96caf0fcce09b87621c11b584a6d81cc7df86
Author: Joren De Cuyper
Date: Thu May 14 12:56:10 2015 +0200
tdf#76941 and tdf#87539: docx export image greyscale, watermark, black&white
Thanks to Miklos :)
Change-Id: Ib6344ff654e39bf712d7071545573fb2ec525b63
Reviewed-on: https://gerrit.libreoffice.org/15733
Tested-by: Jenkins
Reviewed-by: Joren De Cuyper
diff --git a/sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt
b/sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt
new file mode 100644
index 000..b2166bd
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/picture_colormode_black_white.odt differ
diff --git a/sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx
b/sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx
new file mode 100644
index 000..2bc6458
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/picture_colormode_grayscale.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt
b/sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt
new file mode 100644
index 000..70dd5e9
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/picture_colormode_watermark.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 6dec1e1..03afe28 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -948,6 +948,36 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWrapPolygon,
"picture-wrap-polygon.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aSeq.getLength());
}
+DECLARE_OOXMLEXPORT_TEST(testPictureColormodeGrayscale,
"picture_colormode_grayscale.docx")
+{
+// THe problem was that the grayscale was not exported
+xmlDocPtr pXmlDoc = parseExport ("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:grayscl",
1);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testPictureColormodeBlackWhite,
"picture_colormode_black_white.odt")
+{
+xmlDocPtr pXmlDoc = parseExport ("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:biLevel",
"thresh", "5");
+}
+
+DECLARE_OOXMLEXPORT_TEST(testPictureColormodeWatermark,
"picture_colormode_watermark.odt")
+{
+xmlDocPtr pXmlDoc = parseExport ("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum",
"bright", "5");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/a:lum",
"contrast", "-7");
+}
+
+
DECLARE_OOXMLEXPORT_TEST(testExportShadow, "bnc637947.odt")
{
// The problem was that shadows of shapes from non-OOXML origin were not
exported to DrawingML
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index dcce02f..59027ee 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4192,13 +4192,28 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
completely discarding it.
*/
if ( aRelId.isEmpty() )
-m_pSerializer->singleElementNS( XML_a, XML_blip,
+m_pSerializer->startElementNS( XML_a, XML_blip,
FSEND );
else
-m_pSerializer->singleElementNS( XML_a, XML_blip,
+m_pSerializer->startElementNS( XML_a, XML_blip,
FSNS( XML_r, nImageType ), aRelId.getStr(),
FSEND );
+pItem = 0;
+sal_uInt32 nMode = GRAPHICDRAWMODE_STANDARD;
+
+if ( pGrfNode && SfxItemState::SET ==
pGrfNode->GetSwAttrSet().GetItemState(RES_GRFATR_DRAWMODE, true, &pItem))
+{
+nMode = static_cast(pItem)->GetValue();
+if (nMode == GRAPHICDRAWMODE_GREYS)
+m_pSerializer->singleElementNS (XML_a, XML_grayscl, FSEND);
+else if (nMode == GRAPHICDRAWMODE_MONO) //black/white has a 0,5
threshold in LibreOffice
+m_pSerializer-&g
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/comment_initials.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |9 +
sw/source/uibase/fldui/fldmgr.cxx |4 +++-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit fcc7ba441ec8e5116bbcc08c88b5ddb7c892c988
Author: Joren De Cuyper
Date: Fri May 15 20:11:52 2015 +0200
tdf#85911 docx: export comment initials
Change-Id: I1437c197312911a15a50715235d840b24117bfba
Reviewed-on: https://gerrit.libreoffice.org/15742
Tested-by: Jenkins
Reviewed-by: Joren De Cuyper
diff --git a/sw/qa/extras/ooxmlexport/data/comment_initials.odt
b/sw/qa/extras/ooxmlexport/data/comment_initials.odt
new file mode 100644
index 000..9b84ed8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/comment_initials.odt
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 03acd85..6dec1e1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -851,6 +851,15 @@
DECLARE_OOXMLEXPORT_TEST(testDashedLine_CustDashPercentage, "dashed_line_custdas
assertXPath(pXmlDoc,"/w:document/w:body/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:ln[1]/a:custDash[1]/a:ds[3]",
"sp", "30");
}
+DECLARE_OOXMLEXPORT_TEST(testCommentInitials, "comment_initials.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/comments.xml");
+if (!pXmlDoc)
+ return;
+
+assertXPath(pXmlDoc,"/w:comments/w:comment[1]", "initials", "initials");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTextboxRoundedCorners,
"textbox-rounded-corners.docx")
{
uno::Reference xShape = getShape(1);
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index 5a1d5e4..80308ff 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -78,6 +78,7 @@
#include
#include
#include
+#include
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
@@ -773,13 +774,14 @@ bool SwFldMgr::InsertFld(
{ // ATTENTION this field is inserted by a separate dialog
case TYP_POSTITFLD:
{
+SvtUserOptions aUserOpt;
SwPostItFieldType* pType =
static_cast(pCurShell->GetFldType(0, RES_POSTITFLD));
SwPostItField* pPostItField =
new SwPostItField(
pType,
rData.m_sPar1, // author
rData.m_sPar2, // content
-OUString(), // author's initials
+aUserOpt.GetID(), // author's initials
OUString(), // name
DateTime(DateTime::SYSTEM) );
pFld = pPostItField;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/customshapepresetdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1f576d9c83f239e1c05ebcd04fa97038942e4d5 Author: Joren De Cuyper Date: Sat May 16 13:41:57 2015 +0200 Fix copy-paste error Due the variables above this error, I think this needs to be the .Height, not .Width Change-Id: If796cd1950f59d0e1a6005c1c1185066c688ef55 Reviewed-on: https://gerrit.libreoffice.org/15748 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 94d29f7..92252f3 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -146,7 +146,7 @@ awt::Rectangle lcl_parseRectangle(const OString& rValue) aToken = aToken.copy(nIndex); assert(aToken.startsWith(aExpectedHeightPrefix)); nIndex = strlen(aExpectedHeightPrefix); -aRectangle.Width = static_cast(aToken.copy(nIndex).toInt32()); +aRectangle.Height = static_cast(aToken.copy(nIndex).toInt32()); return aRectangle; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools oox/source sw/qa unotools/source
dev/null |binary
include/unotools/docinfohelper.hxx|3 -
oox/source/core/xmlfilterbase.cxx |5 +--
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |7
unotools/source/config/docinfohelper.cxx | 50 ++
5 files changed, 20 insertions(+), 45 deletions(-)
New commits:
commit 1e49e40c3694cd5750b65fc726b9684ae4185d4f
Author: Joren De Cuyper
Date: Fri May 15 13:27:47 2015 +0200
tdf#91064: Revert "tdf#89790 DOCX: saving LO version number in app.xml"
This reverts commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5.
Change-Id: I69a16425fc36979d49f409bbd7921495a22a35dc
Reviewed-on: https://gerrit.libreoffice.org/15737
Tested-by: Jenkins
Reviewed-by: Joren De Cuyper
diff --git a/include/unotools/docinfohelper.hxx
b/include/unotools/docinfohelper.hxx
index 320b3b5..ddc28b0 100644
--- a/include/unotools/docinfohelper.hxx
+++ b/include/unotools/docinfohelper.hxx
@@ -29,8 +29,7 @@ class UNOTOOLS_DLLPUBLIC DocInfoHelper
{
public:
static OUString GetGeneratorString();
-static OUString GetApplicationString();
-static OUString GetVersionString();
+
};
} // namespace utl
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index cde386b..4ef16d0 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -58,7 +58,6 @@
#include
#include
#include
-#include
using ::com::sun::star::xml::dom::DocumentBuilder;
using ::com::sun::star::xml::dom::XDocument;
@@ -693,9 +692,9 @@ writeAppProperties( XmlFilterBase& rSelf, Reference<
XDocumentProperties > xProp
writeElement( pAppProps, XML_HyperlinksChanged, "hyperlinks changed" );
writeElement( pAppProps, XML_DigSig,"digital signature" );
#endif /* def OOXTODO */
-writeElement( pAppProps, XML_Application,
utl::ConfigManager::getProductName() );
-writeElement( pAppProps, XML_AppVersion,
utl::DocInfoHelper::GetVersionString() );
+writeElement( pAppProps, XML_Application,
utl::DocInfoHelper::GetGeneratorString() );
#ifdef OOXTODO
+writeElement( pAppProps, XML_AppVersion,"app version" );
writeElement( pAppProps, XML_DocSecurity, "doc security" );
#endif /* def OOXTODO */
diff --git a/sw/qa/extras/ooxmlexport/data/tdf89790.docx
b/sw/qa/extras/ooxmlexport/data/tdf89790.docx
deleted file mode 100644
index 180951e..000
Binary files a/sw/qa/extras/ooxmlexport/data/tdf89790.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 07ba2ae..4cf50c9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -797,13 +797,6 @@ DECLARE_OOXMLEXPORT_TEST(testSectionHeader,
"sectionprot.odt")
}
}
-DECLARE_OOXMLEXPORT_TEST(testTdf89790, "tdf89790.docx")
-{
-if (xmlDocPtr pXmlDoc = parseExport("docProps/app.xml"))
-
- assertXPath(pXmlDoc,
"/extended-properties:Properties/extended-properties:AppVersion");
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/docinfohelper.cxx
b/unotools/source/config/docinfohelper.cxx
index 0ea143cf..b5d0cf9 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -41,44 +41,29 @@ OUString DocInfoHelper::GetGeneratorString()
{
aResult.append( aValue.replace( ' ', '_' ) );
aResult.append( '/' );
-}
-
-aValue = GetVersionString();
-if ( !aValue.isEmpty() )
-{
-aResult.append( aValue );
-}
-
-return aResult.makeStringAndClear();
-}
-
-
-OUString DocInfoHelper::GetVersionString()
-{
-OUStringBuffer aResult;
-// version is _$
-OUString aValue( utl::ConfigManager::getProductVersion() );
-if ( !aValue.isEmpty() )
-{
-aResult.append( aValue.replace( ' ', '_' ) );
-
-aValue = utl::ConfigManager::getProductExtension();
+aValue = utl::ConfigManager::getProductVersion();
if ( !aValue.isEmpty() )
{
aResult.append( aValue.replace( ' ', '_' ) );
+
+aValue = utl::ConfigManager::getProductExtension();
+if ( !aValue.isEmpty() )
+{
+aResult.append( aValue.replace( ' ', '_' ) );
+}
}
-}
-OUString os( "$_OS" );
-OUString arch( "$_ARCH" );
-::rtl::Bootstrap::expandMacros(os);
-::rtl::Bootstrap::expandMacros(arch);
-aResult.append( '$' );
-aResult.append( os );
-aResult.append( '_' );
-aResult.append( arch );
-aResult.appe
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 53fe42375e31f09dccefbc43dfeabd988cc52a95
Author: Joren De Cuyper
Date: Tue May 12 22:19:06 2015 +0200
tdf#76941 : docx export image greyscale
Change-Id: I104d6db7834b4235248736a9498a0e2a20cc7a43
Reviewed-on: https://gerrit.libreoffice.org/15722
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 701ebc7..62ffaed 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3224,22 +3224,22 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
uno::Sequence aTablePosition =
aGrabBagElement->second.get >();
for (sal_Int32 i = 0; i < aTablePosition.getLength(); ++i)
{
-if (aTablePosition[i].Name == "vertAnchor" &&
!aTablePosition[i].Value.get().isEmpty())
+if (aTablePosition[i].Name == "vertAnchor")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_vertAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == "tblpYSpec" &&
!aTablePosition[i].Value.get().isEmpty())
+else if (aTablePosition[i].Name == "tblpYSpec")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_tblpYSpec ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == "horzAnchor" &&
!aTablePosition[i].Value.get().isEmpty())
+else if (aTablePosition[i].Name == "horzAnchor")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_horzAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == "tblpXSpec" &&
!aTablePosition[i].Value.get().isEmpty())
+else if (aTablePosition[i].Name == "tblpXSpec")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_tblpXSpec ),
strTemp.getStr() );
@@ -4193,6 +4193,14 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
FSNS( XML_r, nImageType ), aRelId.getStr(),
FSEND );
+const SfxPoolItem* pItemm;
+if (SfxItemState::SET ==
pOLENode->GetSwAttrSet().GetItemState(RES_GRFATR_DRAWMODE, true, &pItemm))
+{
+const SfxEnumItem* nMode = static_cast(pItemm);
+if (nMode && nMode->GetValue() == GRAPHICDRAWMODE_GREYS )
+m_pSerializer->singleElementNS (XML_a, XML_grayscl, FSEND);
+}
+
if (pSdrObj){
WriteSrcRect(pSdrObj);
}
___
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/GraphicImport.cxx | 219 --
1 file changed, 109 insertions(+), 110 deletions(-)
New commits:
commit ab81e3bff2a1844be67209bc8947d539edbaf8e6
Author: Joren De Cuyper
Date: Mon May 11 22:14:41 2015 +0200
tdf#76941 : image greyscale not imported correctly
The eColorMode and other graphic attributes were never checked due to this
statement.
This statement is last altered by 0f0a22ade666d33a10d9c83c0f636be9acf1ed39
This only fixes the import.
Change-Id: I9ba7e745582faf37898f284600d638aa4806a362
Reviewed-on: https://gerrit.libreoffice.org/15710
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 56c3741..a97da37 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1220,126 +1220,125 @@ uno::Reference< text::XTextContent >
GraphicImport::createGraphicObject( const b
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_SIZE_PROTECTED ),
uno::makeAny(true));
-if (m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
-{
-sal_Int32 nWidth = m_pImpl->nRightPosition -
m_pImpl->nLeftPosition;
-//adjust margins
-if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
+sal_Int32 nWidth = m_pImpl->nRightPosition -
m_pImpl->nLeftPosition;
+//adjust margins
+if( (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT &&
+(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
+m_pImpl->nHoriRelation == text::RelOrientation::FRAME) ) ||
+(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
+m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
+m_pImpl->nLeftMargin = 0;
+if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
m_pImpl->nHoriRelation == text::RelOrientation::FRAME)
) ||
- (m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
- m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nLeftMargin = 0;
-if((m_pImpl->nHoriOrient == text::HoriOrientation::RIGHT &&
-(m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nHoriRelation ==
text::RelOrientation::FRAME) ) ||
-(m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_PRINT_AREA ))
-m_pImpl->nRightMargin = 0;
-// adjust top/bottom margins
-if( m_pImpl->nVertOrient == text::VertOrientation::TOP &&
-( m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nTopMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
-( m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA ||
-m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_FRAME))
-m_pImpl->nBottomMargin = 0;
-if( m_pImpl->nVertOrient == text::VertOrientation::BOTTOM &&
-m_pImpl->nVertRelation ==
text::RelOrientation::PAGE_PRINT_AREA )
-m_pImpl->nBottomMargin = 0;
-
-//adjust alignment
-if( m_pImpl->nHoriOrient == text::HoriOrientation::INSIDE &&
-m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_FRAME )
-{
-// convert 'left to page' to 'from left - to page
text area'
-m_pImpl->nHoriOrient = text::HoriOrientation::NONE;
-m_pImpl->nHoriRelation =
text::RelOrientation::PAGE_PRINT_AREA;
-m_pImpl->nLeftPosition = - nWidth;
-}
-else if( m_pImpl->nHoriOrient ==
text::HoriOrientation::OUTSIDE &&
-m_pImpl->nHoriRelation ==
text::RelOrientation::PAGE_FRAME )
-{
-// convert 'right to page' to 'from left 0 to right page
bord
[Libreoffice-commits] core.git: include/svx svx/source sw/source
include/svx/dialogs.hrc |1 +
include/svx/srchdlg.hxx |1 +
svx/source/dialog/srchdlg.cxx|2 ++
svx/source/dialog/srchdlg.src|4
sw/source/uibase/uiview/viewsrch.cxx |7 ++-
5 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 69b35cb45375c324c1e28fd4547ce874e4894f30
Author: Joren De Cuyper
Date: Sat May 2 17:21:24 2015 +0200
related tdf#88608: find: add string for reaching start of document
If you searched backwards and reached the start of the document,
the text "Reached the end of the document" was shown.
Change-Id: Ic35884de2f1ada07e76c9c3e27cf6c81c4a83304
Reviewed-on: https://gerrit.libreoffice.org/15597
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index e6abab7..709bd3b 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -227,6 +227,7 @@
#define RID_SVXSTR_CALC_STYLES (RID_SVX_START + 85)
#define RID_SVXSTR_SEARCH_NOT_FOUND (RID_SVX_START + 88)
#define RID_SVXSTR_QUERY_EXIT_RECOVERY (RID_SVX_START + 89)
+#define RID_SVXSTR_SEARCH_START (RID_SVX_START + 90)
// ResIds for the PageDialog
// Strings of the ToolBox-Controls from tbcontrl.cxx
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 0ad7edb..81728a9 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -82,6 +82,7 @@ enum SearchLabel
{
SL_Empty,
SL_End,
+SL_Start,
SL_EndSheet,
SL_NotFound
};
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 415c140..33dbbb8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2319,6 +2319,8 @@ void SvxSearchDialogWrapper::SetSearchLabel(const
SearchLabel& rSL)
OUString sStr;
if (rSL == SL_End)
sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_END);
+else if (rSL == SL_Start)
+sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_START);
else if (rSL == SL_EndSheet)
sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_END_SHEET);
else if (rSL == SL_NotFound)
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index c0fd4e5..e50d3d7 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -54,5 +54,9 @@ String RID_SVXSTR_SEARCH_NOT_FOUND
{
Text [ en-US ] = "Search key not found" ;
};
+String RID_SVXSTR_SEARCH_START
+{
+Text [ en-US ] = "Reached the beginning of the document" ;
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index e23c53c..e1deaba 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -544,7 +544,12 @@ bool SwView::SearchAndWrap(bool bApi)
pWait.reset();
#if HAVE_FEATURE_DESKTOP
if (m_bFound)
-SvxSearchDialogWrapper::SetSearchLabel(SL_End);
+{
+if (!bSrchBkwrd)
+SvxSearchDialogWrapper::SetSearchLabel(SL_End);
+else
+SvxSearchDialogWrapper::SetSearchLabel(SL_Start);
+}
else if(!bApi)
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/vmlexport.cxx | 22 +++---
1 file changed, 7 insertions(+), 15 deletions(-)
New commits:
commit 8908f10fe3b6566db469a1f2bd2674d8d0425165
Author: Joren De Cuyper
Date: Sun May 10 12:47:01 2015 +0200
Code is executed in both cases so take it outside the statement
Change-Id: I8d4c3a62d4e63d2666bfce18d6af772a29e271d4
Reviewed-on: https://gerrit.libreoffice.org/15695
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index a7ed878..9e8e6d2 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1109,24 +1109,16 @@ sal_Int32 VMLExport::StartShape()
if (!sAnchorId.isEmpty())
m_pShapeAttrList->addNS(XML_wp14, XML_anchorId,
OUStringToOString(sAnchorId, RTL_TEXTENCODING_UTF8));
-if ( nShapeElement >= 0 && !m_pShapeAttrList->hasAttribute( XML_type ) )
+if ( nShapeElement >= 0 && !m_pShapeAttrList->hasAttribute( XML_type ) &&
bReferToShapeType )
{
-if ( bReferToShapeType )
-{
-m_pShapeAttrList->add( XML_type, OStringBuffer( 20 )
-.append( "shapetype_" ).append( sal_Int32( m_nShapeType ) )
-.makeStringAndClear() );
-}
-
-// start of the shape
-m_pSerializer->startElementNS( XML_v, nShapeElement,
XFastAttributeListRef( m_pShapeAttrList ) );
-}
-else
-{
-// start of the shape
-m_pSerializer->startElementNS( XML_v, nShapeElement,
XFastAttributeListRef( m_pShapeAttrList ) );
+m_pShapeAttrList->add( XML_type, OStringBuffer( 20 )
+.append( "shapetype_" ).append( sal_Int32( m_nShapeType ) )
+.makeStringAndClear() );
}
+// start of the shape
+m_pSerializer->startElementNS( XML_v, nShapeElement,
XFastAttributeListRef( m_pShapeAttrList ) );
+
// now check if we have some editeng text (not associated textbox) and we
have a text exporter registered
const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, m_pSdrObject);
if (pTxtObj && m_pTextExport &&
msfilter::util::HasTextBoxContent(m_nShapeType) &&
!IsWaterMarkShape(m_pSdrObject->GetName()) && !lcl_isTextBox(m_pSdrObject))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c342295aa8269537494c603429abbec9259f997d Author: Joren De Cuyper Date: Sun May 10 19:06:32 2015 +0200 Imagedata test: test fill-attributes are not written at all Change-Id: Iac7e3a14753ee0e0c6d64bda270043462fa3f20a Reviewed-on: https://gerrit.libreoffice.org/15698 Tested-by: Jenkins Reviewed-by: Joren De Cuyper diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index a14388d..224e546 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -1115,8 +1115,8 @@ DECLARE_OOXMLEXPORT_TEST(NoFillAttrInImagedata, "NoFillAttrInImagedata.docx") if (!pXmlDoc) return; -assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata", "type", ""); -assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata", "color2", ""); +assertXPathNoAttribute(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata", "type"); +assertXPathNoAttribute(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect/v:imagedata", "color2"); } DECLARE_OOXMLEXPORT_TEST(testBnc837302, "bnc837302.docx") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|2 ++
sw/source/filter/ww8/docxattributeoutput.cxx |8
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit c2cc63338f3c2f38d0a4f6be822c6cdeedb8213c
Author: Joren De Cuyper
Date: Sun May 10 11:24:20 2015 +0200
Don't write empty vertAnchor, HorzAnchor, tblpYSpec and tblpXSpec attributes
This attributes needs a value from the enumeration.
See
http://dev-builds.libreoffice.org/crashtest/6183a945de03dcd5fe0b967d5814a0add954a8c8/validation/docx/fdo43632-1.docx.log
:
(word/document.xml:2 col:70,187) cvc-enumeration-valid: Value '' is not
facet-valid with respect to enumeration
'[inline, top, center, bottom, inside, outside]'. It must be a value from
the enumeration.
(word/document.xml:2 col:70,187) cvc-attribute.3: The value '' of attribute
'w:tblpYSpec' on element 'w:tblpPr'
is not valid with respect to its type, 'ST_YAlign'.
Change-Id: Ibe4ccdf1c273e2ede22dc8865ec91af4de162e10
Reviewed-on: https://gerrit.libreoffice.org/15693
Tested-by: Jenkins
Reviewed-by: Joren De Cuyper
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 89a1502..07ba2ae 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -234,6 +234,8 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTable, "fdo77887.docx")
assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "tblpY", "2266");
assertXPath(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "vertAnchor",
"page");
+//make sure not to write empty attributes which requires enumeration
+assertXPathNoAttribute(pXmlDoc,
"/w:document[1]/w:body[1]/w:tbl[1]/w:tblPr[1]/w:tblpPr[1]", "tblpYSpec");
}
DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeRight, "tdf90681-1.odt")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index abd7557..9147bfe 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3224,22 +3224,22 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
uno::Sequence aTablePosition =
aGrabBagElement->second.get >();
for (sal_Int32 i = 0; i < aTablePosition.getLength(); ++i)
{
-if (aTablePosition[i].Name == "vertAnchor")
+if (aTablePosition[i].Name == "vertAnchor" &&
aTablePosition[i].Value.get() != "")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_vertAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == "tblpYSpec")
+else if (aTablePosition[i].Name == "tblpYSpec" &&
aTablePosition[i].Value.get() != "")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_tblpYSpec ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == "horzAnchor")
+else if (aTablePosition[i].Name == "horzAnchor" &&
aTablePosition[i].Value.get() != "")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_horzAnchor ),
strTemp.getStr() );
}
-else if (aTablePosition[i].Name == "tblpXSpec")
+else if (aTablePosition[i].Name == "tblpXSpec" &&
aTablePosition[i].Value.get() != "")
{
OString strTemp =
OUStringToOString(aTablePosition[i].Value.get(),
RTL_TEXTENCODING_UTF8);
attrListTablePos->add( FSNS( XML_w, XML_tblpXSpec ),
strTemp.getStr() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 4a0cf72f40e9545d367f48617c2834146d7bec1a
Author: Joren De Cuyper
Date: Sat May 2 17:48:39 2015 +0200
tdf#88608: clear SearchLabel when altering the search string
Change-Id: Ifc31fbd1ddee1e055bb62b9ad098ae9410758147
Reviewed-on: https://gerrit.libreoffice.org/15598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index a5f8b17..ea9519f 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
@@ -195,6 +196,11 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
{
case MouseNotifyEvent::KEYINPUT:
{
+// Clear SearchLabel when altering the search string
+#if HAVE_FEATURE_DESKTOP
+SvxSearchDialogWrapper::SetSearchLabel(SL_Empty);
+#endif
+
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
bool bShift = pKeyEvent->GetKeyCode().IsShift();
bool bMod1 = pKeyEvent->GetKeyCode().IsMod1();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/export/vmlexport.cxx | 77 +++
sw/qa/extras/ooxmlexport/data/NoFillAttrInImagedata.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx| 11 ++
3 files changed, 51 insertions(+), 37 deletions(-)
New commits:
commit 101cc7a8a471b50947ccca0711417b2c0f3ef574
Author: Joren De Cuyper
Date: Thu May 7 21:39:49 2015 +0200
Do not write v:fill properties on export of imagedata
See validation log of fdo73214:
ERROR cvc-complex-type.3.2.2: Attribute 'type' is not allowed to appear in
element 'v:imagedata'.
ERROR cvc-complex-type.3.2.2: Attribute 'color2' is not allowed to appear
in element 'v:imagedata'.
http://dev-builds.libreoffice.org/crashtest/d879d5346b525c478e93363b7ec06e797ce01461/validation/docx/fdo73214-1.docx.log
Change-Id: I99eacc05ed28c3cd848326fd08f3668a1ce0f4fb
Reviewed-on: https://gerrit.libreoffice.org/15668
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 570416d..a7ed878 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -562,39 +562,6 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const Rectangle& rRect
sal_uInt32 nValue;
sax_fastparser::FastAttributeList *pAttrList =
FastSerializerHelper::createAttrList();
-if ( rProps.GetOpt( ESCHER_Prop_fillType, nValue ) )
-{
-const char *pFillType = NULL;
-switch ( nValue )
-{
-case ESCHER_FillSolid: pFillType = "solid";
break;
-// TODO case ESCHER_FillPattern: pFillType =
""; break;
-case ESCHER_FillTexture: pFillType = "tile";
break;
-// TODO case ESCHER_FillPicture: pFillType =
""; break;
-// TODO case ESCHER_FillShade: pFillType =
""; break;
-// TODO case ESCHER_FillShadeCenter: pFillType =
""; break;
-// TODO case ESCHER_FillShadeShape: pFillType =
""; break;
-// TODO case ESCHER_FillShadeScale: pFillType =
""; break;
-// TODO case ESCHER_FillShadeTitle: pFillType =
""; break;
-// TODO case ESCHER_FillBackground: pFillType =
""; break;
-default:
-#if OSL_DEBUG_LEVEL > 0
-fprintf( stderr, "TODO: unhandled fill type\n"
);
-#endif
-break;
-}
-if ( pFillType )
-pAttrList->add( XML_type, pFillType );
-}
-else if (!rProps.GetOpt(ESCHER_Prop_fillColor, nValue))
-pAttrList->add( XML_on, "false" );
-
-if ( rProps.GetOpt( ESCHER_Prop_fillColor, nValue ) )
-impl_AddColor( m_pShapeAttrList, XML_fillcolor, nValue
);
-
-if ( rProps.GetOpt( ESCHER_Prop_fillBackColor, nValue ) )
-impl_AddColor( pAttrList, XML_color2, nValue );
-
bool imageData = false;
EscherPropSortStruct aStruct;
if ( rProps.GetOpt( ESCHER_Prop_fillBlip, aStruct ) &&
m_pTextExport)
@@ -613,14 +580,50 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const Rectangle& rRect
if ( rProps.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) )
impl_AddBool( pAttrList, FSNS(XML_o,
XML_detectmouseclick), nValue != 0 );
-if (rProps.GetOpt(ESCHER_Prop_fillOpacity, nValue))
-// Partly undo the transformation at the end of
EscherPropertyContainer::CreateFillProperties(): VML opacity is 0..1.
-pAttrList->add(XML_opacity,
OString::number(double((nValue * 100) >> 16) / 100));
-
if (imageData)
m_pSerializer->singleElementNS( XML_v, XML_imagedata,
XFastAttributeListRef( pAttrList ) );
else
+{
+if ( rProps.GetOpt( ESCHER_Prop_fillType, nValue ) )
+{
+const char *pFillType = NULL;
+switch ( nValue )
+{
+case ESCHER_FillSolid: pFillType =
"solid"; break;
+
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 442701de0c110ca58ff41abe6bf7ec4496f8457d
Author: Joren De Cuyper
Date: Sat May 9 18:56:40 2015 +0200
Don't write empty value when exporting grab-bagged w:docPartUnique
See
http://dev-builds.libreoffice.org/crashtest/e658cb4d5ce49d3a3c6acc63155974b5ff8490c7/validation/docx/fdo33590-2.docx.log
(footer1.xml:2 col:890) cvc-datatype-valid.1.2.1: '' is not a valid value
for 'boolean'.
(footer1.xml:2 col:890) cvc-attribute.3: The value '' of attribute 'w:val'
on
element 'w:docPartUnique' is not valid with respect to its type, 'ST_OnOff'.
Original document:
RT document:
Change-Id: If41af8f4bca99fba4d3ad0c966c2345f87ea422a
solution: if value is empty, export it as true (default ST-OnOff value)
Reviewed-on: https://gerrit.libreoffice.org/15686
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bc5d40f..abd7557 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8004,7 +8004,12 @@ void DocxAttributeOutput::ParaGrabBag(const
SfxGrabBagItem& rItem)
FSNS( XML_w, XML_docPartCategory ),
OUStringToOString( sValue,
RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name ==
"ooxml:CT_SdtDocPart_docPartUnique")
-AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w, XML_docPartUnique ), "" );
+{
+if (sValue.isEmpty())
+sValue = "true";
+AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w, XML_docPartUnique ),
+OUStringToOString( sValue, RTL_TEXTENCODING_UTF8
).getStr() );
+}
}
}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_equation")
___
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/undo.hrc | 125 +++ sw/source/core/undo/undo.src | 488 ++- 2 files changed, 612 insertions(+), 1 deletion(-) New commits: commit d7336b91f0539751c1e955ecbbf3b38991c87387 Author: Joren De Cuyper Date: Mon May 4 19:00:44 2015 +0200 Revert "Delete unused strings in undo.src and undo.hrc" This reverts commit 4c07124cf4f7684d271d0e71a095c67e0f988e45. It looks like these strings are used via an iteration in docundo.cxx So, restore them. Change-Id: I1b0428de3d56b04908284c94b47dc6021375cc8e Reviewed-on: https://gerrit.libreoffice.org/15629 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index d17c13e..f258063 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -20,13 +20,123 @@ #include // Undo #define UNDO_BASE (RC_WRTSH_BEGIN + 8) +#define STR_CANT_UNDO (UNDO_BASE + 0) // im enun folgen hier START & END fuer die Klammerungen, +// Id's fuer die Undo/Redo/Repeat faehigen "Funktionen" +#define STR_DELETE_UNDO (UNDO_BASE + 3) +#define STR_INSERT_UNDO (UNDO_BASE + 4) +#define STR_OVR_UNDO(UNDO_BASE + 5) +#define STR_SPLITNODE_UNDO (UNDO_BASE + 6) +#define STR_INSATTR_UNDO(UNDO_BASE + 7) +#define STR_SETFMTCOLL_UNDO (UNDO_BASE + 8) +#define STR_RESET_ATTR_UNDO (UNDO_BASE + 9) +#define STR_INSFMT_ATTR_UNDO(UNDO_BASE +10) +#define STR_INSERT_DOC_UNDO (UNDO_BASE +11) +#define STR_COPY_UNDO (UNDO_BASE +12) +#define STR_INSTABLE_UNDO (UNDO_BASE +13) +#define STR_TABLETOTEXT_UNDO(UNDO_BASE +14) +#define STR_TEXTTOTABLE_UNDO(UNDO_BASE +15) +#define STR_SORT_TXT(UNDO_BASE +16) +#define STR_INSERTFLY (UNDO_BASE +17) +#define STR_TABLEHEADLINE (UNDO_BASE +18) +#define STR_INSERTSECTION (UNDO_BASE +19) +#define STR_OUTLINE_LR (UNDO_BASE +20) +#define STR_OUTLINE_UD (UNDO_BASE +21) +#define STR_INSNUM (UNDO_BASE +22) +#define STR_NUMUP (UNDO_BASE +23) +#define STR_MOVENUM (UNDO_BASE +24) +#define STR_INSERTDRAW (UNDO_BASE +25) +#define STR_NUMORNONUM (UNDO_BASE +26) +#define STR_INC_LEFTMARGIN (UNDO_BASE +27) +#define STR_DEC_LEFTMARGIN (UNDO_BASE +28) +#define STR_INSERTLABEL (UNDO_BASE +29) +#define STR_SETNUMRULESTART (UNDO_BASE +30) +#define STR_CHANGEFTN (UNDO_BASE +31) +#define STR_REDLINE (UNDO_BASE +32) +#define STR_ACCEPT_REDLINE (UNDO_BASE +33) +#define STR_REJECT_REDLINE (UNDO_BASE +34) +#define STR_SPLIT_TABLE (UNDO_BASE +35) +#define STR_DONTEXPAND (UNDO_BASE +36) +#define STR_AUTOCORRECT (UNDO_BASE +37) +#define STR_MERGE_TABLE (UNDO_BASE +38) +#define STR_TRANSLITERATE (UNDO_BASE +39) +#define STR_PASTE_CLIPBOARD_UNDO(UNDO_BASE +40) +#define STR_TYPING_UNDO (UNDO_BASE +41) + #define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) // !! umsetzen !!! umsetzen !!! umsetzen #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// umsetzen !!! +// Id's nur fuer die Undo/Redo faehigen "Funktionen" +#define STR_MOVE_UNDO (CORE_REPEAT_END + 1) +#define STR_INSERT_GLOSSARY (CORE_REPEAT_END + 2) +#define STR_DELBOOKMARK (CORE_REPEAT_END + 3) +#define STR_INSBOOKMARK (CORE_REPEAT_END + 4) +#define STR_SORT_TBL(CORE_REPEAT_END + 5) +#define STR_DELETEFLY (CORE_REPEAT_END + 6) +#define STR_AUTOFORMAT (CORE_REPEAT_END + 7) +#define STR_REPLACE (CORE_REPEAT_END + 8) +#define STR_DELETESECTION (CORE_REPEAT_END + 9) +#define STR_CHANGESECTION (CORE_REPEAT_END +10) +#define STR_CHANGESECTPASSWD(CORE_REPEAT_END +11) +#define STR_CHANGEDEFATTR (CORE_REPEAT_END +12) +#define STR_DELNUM (CORE_REPEAT_END +13) +#define STR_DRAWUNDO(CORE_REPEAT_END +14) +#define STR_DRAWGROUP (CORE_REPEAT_END +15) +#define STR_DRAWUNGROUP (CORE_REPEAT_END +16) +#define STR_DRAWDELETE (CORE_REPEAT_END +17) +#define STR_REREAD (CORE_REPEAT_END +18) +#define STR_DELGRF (CORE_REPEAT_END +19) +#define STR_DELOLE (CORE_REPEAT_END +20) +#define STR_TABLE_ATTR (CORE_REPEAT_END +21) +#define STR_TABLE_AUTOFMT (CORE_REPEAT_END +22) +#define STR_TABLE_INSCOL(CORE_REPEAT_END +23) +#define STR_TABLE_INSROW(CORE_RE
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/undo.hrc | 125 --- sw/source/core/undo/undo.src | 488 --- 2 files changed, 1 insertion(+), 612 deletions(-) New commits: commit 4c07124cf4f7684d271d0e71a095c67e0f988e45 Author: Joren De Cuyper Date: Sun May 3 21:29:11 2015 +0200 Delete unused strings in undo.src and undo.hrc These strings were only used in the src and hrc file. No usecase in any .cxx file found. Change-Id: I079f42818bf397c5226a7c1f9d2db37b841437c6 Reviewed-on: https://gerrit.libreoffice.org/15613 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index f258063..d17c13e 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -20,123 +20,13 @@ #include // Undo #define UNDO_BASE (RC_WRTSH_BEGIN + 8) -#define STR_CANT_UNDO (UNDO_BASE + 0) // im enun folgen hier START & END fuer die Klammerungen, -// Id's fuer die Undo/Redo/Repeat faehigen "Funktionen" -#define STR_DELETE_UNDO (UNDO_BASE + 3) -#define STR_INSERT_UNDO (UNDO_BASE + 4) -#define STR_OVR_UNDO(UNDO_BASE + 5) -#define STR_SPLITNODE_UNDO (UNDO_BASE + 6) -#define STR_INSATTR_UNDO(UNDO_BASE + 7) -#define STR_SETFMTCOLL_UNDO (UNDO_BASE + 8) -#define STR_RESET_ATTR_UNDO (UNDO_BASE + 9) -#define STR_INSFMT_ATTR_UNDO(UNDO_BASE +10) -#define STR_INSERT_DOC_UNDO (UNDO_BASE +11) -#define STR_COPY_UNDO (UNDO_BASE +12) -#define STR_INSTABLE_UNDO (UNDO_BASE +13) -#define STR_TABLETOTEXT_UNDO(UNDO_BASE +14) -#define STR_TEXTTOTABLE_UNDO(UNDO_BASE +15) -#define STR_SORT_TXT(UNDO_BASE +16) -#define STR_INSERTFLY (UNDO_BASE +17) -#define STR_TABLEHEADLINE (UNDO_BASE +18) -#define STR_INSERTSECTION (UNDO_BASE +19) -#define STR_OUTLINE_LR (UNDO_BASE +20) -#define STR_OUTLINE_UD (UNDO_BASE +21) -#define STR_INSNUM (UNDO_BASE +22) -#define STR_NUMUP (UNDO_BASE +23) -#define STR_MOVENUM (UNDO_BASE +24) -#define STR_INSERTDRAW (UNDO_BASE +25) -#define STR_NUMORNONUM (UNDO_BASE +26) -#define STR_INC_LEFTMARGIN (UNDO_BASE +27) -#define STR_DEC_LEFTMARGIN (UNDO_BASE +28) -#define STR_INSERTLABEL (UNDO_BASE +29) -#define STR_SETNUMRULESTART (UNDO_BASE +30) -#define STR_CHANGEFTN (UNDO_BASE +31) -#define STR_REDLINE (UNDO_BASE +32) -#define STR_ACCEPT_REDLINE (UNDO_BASE +33) -#define STR_REJECT_REDLINE (UNDO_BASE +34) -#define STR_SPLIT_TABLE (UNDO_BASE +35) -#define STR_DONTEXPAND (UNDO_BASE +36) -#define STR_AUTOCORRECT (UNDO_BASE +37) -#define STR_MERGE_TABLE (UNDO_BASE +38) -#define STR_TRANSLITERATE (UNDO_BASE +39) -#define STR_PASTE_CLIPBOARD_UNDO(UNDO_BASE +40) -#define STR_TYPING_UNDO (UNDO_BASE +41) - #define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) // !! umsetzen !!! umsetzen !!! umsetzen #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// umsetzen !!! -// Id's nur fuer die Undo/Redo faehigen "Funktionen" -#define STR_MOVE_UNDO (CORE_REPEAT_END + 1) -#define STR_INSERT_GLOSSARY (CORE_REPEAT_END + 2) -#define STR_DELBOOKMARK (CORE_REPEAT_END + 3) -#define STR_INSBOOKMARK (CORE_REPEAT_END + 4) -#define STR_SORT_TBL(CORE_REPEAT_END + 5) -#define STR_DELETEFLY (CORE_REPEAT_END + 6) -#define STR_AUTOFORMAT (CORE_REPEAT_END + 7) -#define STR_REPLACE (CORE_REPEAT_END + 8) -#define STR_DELETESECTION (CORE_REPEAT_END + 9) -#define STR_CHANGESECTION (CORE_REPEAT_END +10) -#define STR_CHANGESECTPASSWD(CORE_REPEAT_END +11) -#define STR_CHANGEDEFATTR (CORE_REPEAT_END +12) -#define STR_DELNUM (CORE_REPEAT_END +13) -#define STR_DRAWUNDO(CORE_REPEAT_END +14) -#define STR_DRAWGROUP (CORE_REPEAT_END +15) -#define STR_DRAWUNGROUP (CORE_REPEAT_END +16) -#define STR_DRAWDELETE (CORE_REPEAT_END +17) -#define STR_REREAD (CORE_REPEAT_END +18) -#define STR_DELGRF (CORE_REPEAT_END +19) -#define STR_DELOLE (CORE_REPEAT_END +20) -#define STR_TABLE_ATTR (CORE_REPEAT_END +21) -#define STR_TABLE_AUTOFMT (CORE_REPEAT_END +22) -#define STR_TABLE_INSCOL(CORE_REPEAT_END +23) -#define STR_TABLE_INSROW(CORE_REPEAT_END +24) -#define STR_TABLE_DELBOX(CORE_REPEAT_END
[Libreoffice-commits] core.git: 2 commits - sfx2/inc sfx2/source
sfx2/inc/filedlghelper.hrc | 14 -- sfx2/source/dialog/filedlghelper.src | 70 -- sfx2/source/doc/doc.hrc | 55 --- sfx2/source/doc/doc.src | 173 --- 4 files changed, 1 insertion(+), 311 deletions(-) New commits: commit b3d5cba226cd14800345641b05df1b4d3f977542 Author: Joren De Cuyper Date: Sun May 3 19:43:34 2015 +0200 Delete unused strings in doc.src and doc.hrc These strings were only used in the src and hrc file. No usecase in any .cxx file found. Change-Id: Ib590629ee4c7a488254a18398ff92e9259f4589c Reviewed-on: https://gerrit.libreoffice.org/15612 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index 4f16fdc..a2e8f68 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -29,57 +29,18 @@ #define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 1) #define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 2) -#define STR_DELETE_REGION (RID_SFX_DOC_START+14) -#define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15) - -#define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0) -#define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1) - -#define BMP_STYLES_FAMILY1 (RID_SFX_DOC_START+ 2) -#define BMP_STYLES_FAMILY2 (RID_SFX_DOC_START+ 3) -#define BMP_STYLES_FAMILY3 (RID_SFX_DOC_START+ 4) -#define BMP_STYLES_FAMILY4 (RID_SFX_DOC_START+ 5) - -#define STR_STYLES (RID_SFX_DOC_START+ 18) -#define STR_MACROS (RID_SFX_DOC_START+ 19) - -#define STR_PRINT_STYLES(RID_SFX_DOC_START+ 20) -#define STR_PRINT_STYLES_HEADER (RID_SFX_DOC_START+ 21) #define STR_BACKUP_COPY (RID_SFX_DOC_START+ 23) #define STR_ERROR_SAVE (RID_SFX_DOC_START+ 27) #define STR_TEMPLATE_FILTER (RID_SFX_DOC_START+ 28) -#define STR_ERROR_COPY_TEMPLATE (RID_SFX_DOC_START+ 29) - -#define STR_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+ 30) -#define STR_ERROR_MOVE_TEMPLATE (RID_SFX_DOC_START+ 32) -#define STR_ERROR_SAVE_TEMPLATE (RID_SFX_DOC_START+ 34) -#define STR_CONFIG (RID_SFX_DOC_START+ 37) -#define STR_QUERY_DEFAULT_TEMPLATE (RID_SFX_DOC_START+ 39) -#define STR_ERROR_NOSTORAGE (RID_SFX_DOC_START+ 42) -#define STR_QUERY_MUSTOWNFORMAT (RID_SFX_DOC_START+ 44) + #define STR_SAVEDOC (RID_SFX_DOC_START+ 45) #define STR_UPDATEDOC (RID_SFX_DOC_START+ 46) #define STR_SAVEASDOC (RID_SFX_DOC_START+ 47) #define STR_CLOSEDOC(RID_SFX_DOC_START+ 49) #define STR_CLOSEDOC_ANDRETURN (RID_SFX_DOC_START+ 50) -#define STR_WIZARD (RID_SFX_DOC_START+ 51) -#define RID_STR_FILTCONFIG (RID_SFX_DOC_START+ 52) -#define RID_STR_FILTBASIC (RID_SFX_DOC_START+ 53) -#define RID_STR_WARNSTYLEOVERWRITE (RID_SFX_DOC_START+ 54) #define STR_SAVEACOPY (RID_SFX_DOC_START+ 55) -#define RID_OFFICEFILTER(RID_SFX_DOC_START+ 59) -#define RID_OFFICEFILTER_WILDCARD (RID_SFX_DOC_START+ 60) -#define RID_OFFICEFILTER_MACTYPE(RID_SFX_DOC_START+ 61) -#define RID_OFFICEFILTER_OS2TYPE(RID_SFX_DOC_START+ 62) -#define STR_FRAMEOBJECT_PROPERTIES (RID_SFX_DOC_START+ 63) - -#define STR_FSET_FILTERNAME0(RID_SFX_DOC_START+ 64) -#define STR_FSET_FILTERNAME1(RID_SFX_DOC_START+ 65) - -#define STR_TEMPL_MOVED (RID_SFX_DOC_START+ 66) -#define STR_TEMPL_RESET (RID_SFX_DOC_START+ 67) #define STR_AUTOMATICVERSION(RID_SFX_DOC_START+ 68) #define STR_DOCTYPENAME_SW (RID_SFX_DOC_START+ 69) @@ -91,25 +52,11 @@ #define STR_DOCTYPENAME_MESSAGE (RID_SFX_DOC_START+ 75) #define RID_STR_NEW_TASK(RID_SFX_DOC_START+ 76) -#define STR_PACKNGO_NOACCESS(RID_SFX_DOC_START+ 79) -#define STR_PACKNGO_NEWMEDIUM (RID_SFX_DOC_START+ 80) - #define TEMPLATE_LONG_NAMES_ARY (RID_SFX_DOC_START+ 81) #define TEMPLATE_SHORT_NAMES_ARY(RID_SFX_DOC_START+ 82) #define RID_CNT_STR_WAITING (RID_SFX_DOC_START+ 83) -#define STR_OBJECT (RID_SFX_DOC_START+ 84) - -#define BTN_OK (RID_SFX_DOC_START+88) -#define BTN_CANCEL (RID_SFX_DOC_START+89) -#define FT_OK (RID_SFX_DOC_START+90) -#define FT_CANCEL (RID_SFX_DOC_START+91) - -#define
[Libreoffice-commits] core.git: 2 commits - starmath/Library_sm.mk starmath/source sw/source
starmath/Library_sm.mk |5 +
starmath/source/cfgitem.cxx| 125 +++--
sw/source/uibase/shells/drawsh.cxx | 10 ++
3 files changed, 37 insertions(+), 103 deletions(-)
New commits:
commit 7215e025bbeb3e459f0be3d4d20a83ccd7435a02
Author: Marcos Paulo de Souza
Date: Fri Feb 6 02:01:30 2015 -0200
Math: Make use of officecfg API and remove unneeded code
Change-Id: I8b747588ebde70e322b8e6719fb7e2cf789e8a99
Reviewed-on: https://gerrit.libreoffice.org/14347
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 7208dcb..ce46d77 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -27,7 +27,10 @@ $(eval $(call gb_Library_add_defs,sm,\
$(eval $(call gb_Library_use_external,sm,boost_headers))
-$(eval $(call gb_Library_use_custom_headers,sm,oox/generated))
+$(eval $(call gb_Library_use_custom_headers,sm,\
+ officecfg/registry \
+ oox/generated \
+))
$(eval $(call gb_Library_use_sdk_api,sm))
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 8092dd8..648f1b0 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include "cfgitem.hxx"
#include "starmath.hrc"
@@ -60,22 +61,6 @@ static Sequence< OUString > lcl_GetSymbolPropertyNames()
};
}
-static Sequence< OUString > lcl_GetMathPropertyNames()
-{
-return Sequence< OUString > {
-"Print/Title",
-"Print/FormulaText",
-"Print/Frame",
-"Print/Size",
-"Print/ZoomFactor",
-"LoadSave/IsSaveOnlyUsedSymbols",
-"Misc/IgnoreSpacesRight",
-"View/ToolboxVisible",
-"View/AutoRedraw",
-"View/FormulaCursor"
-};
-}
-
static Sequence< OUString > lcl_GetFormatPropertyNames()
{
//! Beware of order according to *_BEGIN *_END defines in format.hxx !
@@ -790,62 +775,17 @@ void SmMathConfig::LoadOther()
if (!pOther)
pOther = new SmCfgOther;
-Sequence< OUString > aNames = lcl_GetMathPropertyNames();
-sal_Int32 nProps = aNames.getLength();
-
-Sequence< Any > aValues( GetProperties( aNames ) );
-if (nProps && aValues.getLength() == nProps)
-{
-const Any *pValues = aValues.getConstArray();
-const Any *pVal = pValues;
-
-sal_Int16 nTmp16 = 0;
-boolbTmp = false;
-
-// Print/Title
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bPrintTitle = bTmp;
-++pVal;
-// Print/FormulaText
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bPrintFormulaText = bTmp;
-++pVal;
-// Print/Frame
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bPrintFrame = bTmp;
-++pVal;
-// Print/Size
-if (pVal->hasValue() && (*pVal >>= nTmp16))
-pOther->ePrintSize = (SmPrintSize) nTmp16;
-++pVal;
-// Print/ZoomFactor
-if (pVal->hasValue() && (*pVal >>= nTmp16))
-pOther->nPrintZoomFactor = nTmp16;
-++pVal;
-// LoadSave/IsSaveOnlyUsedSymbols
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bIsSaveOnlyUsedSymbols = bTmp;
-++pVal;
-// Misc/IgnoreSpacesRight
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bIgnoreSpacesRight = bTmp;
-++pVal;
-// View/ToolboxVisible
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bToolboxVisible = bTmp;
-++pVal;
-// View/AutoRedraw
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bAutoRedraw = bTmp;
-++pVal;
-// View/FormulaCursor
-if (pVal->hasValue() && (*pVal >>= bTmp))
-pOther->bFormulaCursor = bTmp;
-++pVal;
-
-OSL_ENSURE( pVal - pValues == nProps, "property mismatch" );
-SetOtherModified( false );
-}
+pOther->bPrintTitle = officecfg::Office::Math::Print::Title::get();
+pOther->bPrintFormulaText =
officecfg::Office::Math::Print::FormulaText::get();
+pOther->bPrintFrame = officecfg::Office::Math::Print::Frame::get();
+pOther->ePrintSize =
static_cast(officecfg::Office::Math::Print::Size::get());
+pOther->nPrintZoomFactor =
[Libreoffice-commits] core.git: starmath/source
starmath/source/cfgitem.cxx | 220
1 file changed, 82 insertions(+), 138 deletions(-)
New commits:
commit 08894370687c2bea9a2d8001970684bd682295ee
Author: Marcos Paulo de Souza
Date: Fri Jan 30 01:06:18 2015 -0200
starmath: Refactor common code inside cfgitem
using initializer_lists with Sequences
Change-Id: Ic6177f99b6c083710135348039958d72a6faf327
Signed-off-by: Stephan Bergmann
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 043c392..dfb2a09 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include
#include
@@ -31,157 +33,98 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
-
-
static const char aRootName[] = "Office.Math";
#define SYMBOL_LIST "SymbolList"
#define FONT_FORMAT_LIST"FontFormatList"
-
-
-
static Sequence< OUString > lcl_GetFontPropertyNames()
{
-static const char * aPropNames[] =
-{
-"Name",
-"CharSet",
-"Family",
-"Pitch",
-"Weight",
-"Italic",
-0
-};
-
-const char** ppPropName = aPropNames;
-
-Sequence< OUString > aNames( 6 );
-OUString *pNames = aNames.getArray();
-for( sal_Int32 i = 0; *ppPropName; ++i, ++ppPropName )
-{
-pNames[i] = OUString::createFromAscii( *ppPropName );
-}
-return aNames;
+return Sequence< OUString > {
+"Name",
+"CharSet",
+"Family",
+"Pitch",
+"Weight",
+"Italic"
+};
}
-
-
-
static Sequence< OUString > lcl_GetSymbolPropertyNames()
{
-static const char * aPropNames[] =
-{
-"Char",
-"Set",
-"Predefined",
-"FontFormatId",
-0
-};
-
-const char** ppPropName = aPropNames;
-
-Sequence< OUString > aNames( 4 );
-OUString *pNames = aNames.getArray();
-for( sal_Int32 i = 0; *ppPropName; ++i, ++ppPropName )
-{
-pNames[i] = OUString::createFromAscii( *ppPropName );
-}
-return aNames;
+return Sequence< OUString > {
+"Char",
+"Set",
+"Predefined",
+"FontFormatId"
+};
}
-
-
-static const char * aMathPropNames[] =
-{
-"Print/Title",
-"Print/FormulaText",
-"Print/Frame",
-"Print/Size",
-"Print/ZoomFactor",
-"LoadSave/IsSaveOnlyUsedSymbols",
-"Misc/IgnoreSpacesRight",
-"View/ToolboxVisible",
-"View/AutoRedraw",
-"View/FormulaCursor"
-};
-
-
-//! Beware of order according to *_BEGIN *_END defines in format.hxx !
-//! see respective load/save routines here
-static const char * aFormatPropNames[] =
-{
-"StandardFormat/Textmode",
-"StandardFormat/GreekCharStyle",
-"StandardFormat/ScaleNormalBracket",
-"StandardFormat/HorizontalAlignment",
-"StandardFormat/BaseSize",
-"StandardFormat/TextSize",
-"StandardFormat/IndexSize",
-"StandardFormat/FunctionSize",
-"StandardFormat/OperatorSize",
-"StandardFormat/LimitsSize",
-"StandardFormat/Distance/Horizontal",
-"StandardFormat/Distance/Vertical",
-"StandardFormat/Distance/Root",
-"StandardFormat/Distance/SuperScript",
-"StandardFormat/Distance/SubScript",
-"StandardFormat/Distance/Numerator",
-"StandardFormat/Distance/Denominator",
-"StandardFormat/Distance/Fraction",
-"StandardFormat/Distance/StrokeWidth",
-"StandardFormat/Distance/UpperLimit",
-"StandardFormat/Distance/LowerLimit",
-"StandardFormat/Distance/BracketSize",
-"StandardFormat/Distance/BracketSpace",
-"StandardFormat/Distance/MatrixRow",
-"StandardFormat/Distance/MatrixColumn",
-"StandardFormat/Distance/OrnamentSize",
-"StandardFormat/Distance/OrnamentSpace",
-"StandardFormat/Distance/OperatorSize",
-"StandardFormat/Distance/OperatorSpace",
-"StandardFormat/Distance/LeftSpace",
-"StandardFormat/Distance/RightSpace",
-"StandardFormat/Dist
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - scp2/source
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 18 +
1 file changed, 18 insertions(+)
New commits:
commit b25bef87eece6d5ed0492b374e5bf6cc4beefcbe
Author: Maxime de Roucy
Date: Mon Dec 22 13:57:55 2014 +0100
fdo#67534 Fix "Property Handler" shared lock
As explained in the following link, access mode should be set to
"EnableShareDenyNone" to avoid blocking others process to access the
file opened by the Property Handler.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx
Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks
Tested-by: Andras Timar
Conflicts:
scp2/source/winexplorerext/registryitem_winexplorerext.scp
Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
Reviewed-on: https://gerrit.libreoffice.org/14300
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index a8eda1d..ccd1dba 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -339,6 +339,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -347,6 +356,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext_x64;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
___
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' - scp2/source
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 18 +
1 file changed, 18 insertions(+)
New commits:
commit 807e29cbf992ac8bdd7ae6e974bd72ea731d274c
Author: Maxime de Roucy
Date: Mon Dec 22 13:57:55 2014 +0100
fdo#67534 Fix "Property Handler" shared lock
As explained in the following link, access mode should be set to
"EnableShareDenyNone" to avoid blocking others process to access the
file opened by the Property Handler.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx
Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks
Tested-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/14301
Reviewed-by: Andras Timar
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 32c83bc..38a09fd 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -410,6 +410,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
#ifdef BUILD_X64
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
@@ -420,6 +429,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext_x64;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
#endif
RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - scp2/source
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 18 +
1 file changed, 18 insertions(+)
New commits:
commit 1c5b55c92d3ea9ad43534f6020ba627e95178e28
Author: Maxime de Roucy
Date: Mon Dec 22 13:57:55 2014 +0100
fdo#67534 Fix "Property Handler" shared lock
As explained in the following link, access mode should be set to
"EnableShareDenyNone" to avoid blocking others process to access the
file opened by the Property Handler.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx
Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks
Tested-by: Andras Timar
Conflicts:
scp2/source/winexplorerext/registryitem_winexplorerext.scp
Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index a8eda1d..ccd1dba 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -339,6 +339,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -347,6 +356,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext_x64;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 18 +
1 file changed, 18 insertions(+)
New commits:
commit 25686bbcd2d39000640e2b9db835b5b4bea653c1
Author: Maxime de Roucy
Date: Mon Dec 22 13:57:55 2014 +0100
fdo#67534 Fix "Property Handler" shared lock
As explained in the following link, access mode should be set to
"EnableShareDenyNone" to avoid blocking others process to access the
file opened by the Property Handler.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx
Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks
Tested-by: Andras Timar
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 32c83bc..38a09fd 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -410,6 +410,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
#ifdef BUILD_X64
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
@@ -420,6 +429,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
Value = "%PRODUCTNAME Property Handler";
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext_x64;
+ComponentCondition = "VersionNT >= 600";
+Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+Name = "EnableShareDenyNone";
+Value = "#1";
+End
+
#endif
RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/ElementsDockingWindow.hxx|9 -
starmath/source/ElementsDockingWindow.cxx | 10 --
2 files changed, 8 insertions(+), 11 deletions(-)
New commits:
commit fde82414b4c0531c1addcfc99e55ca17d52c3fec
Author: Marcos Paulo de Souza
Date: Sun Nov 16 23:45:14 2014 -0200
Use boost::signal in SmElementsControl
Change-Id: Icb19466db6720350e105b75cb1c0c858f39403ef
Reviewed-on: https://gerrit.libreoffice.org/12509
Reviewed-by: Marcos Paulo de Souza
Tested-by: Marcos Paulo de Souza
diff --git a/starmath/inc/ElementsDockingWindow.hxx
b/starmath/inc/ElementsDockingWindow.hxx
index 73534ef..013b6cd 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
#include
+#include
#include
#include
#include
@@ -80,8 +81,6 @@ class SmElementsControl : public Control
static const sal_uInt16 aFormats[][2];
static const sal_uInt16 aOthers[][2];
-Link aSelectHdlLink;
-
virtual void Paint(const Rectangle&) SAL_OVERRIDE;
virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -115,10 +114,10 @@ public:
void setVerticalMode(bool bVertical);
-void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; }
-
DECL_LINK( ScrollHdl, void* );
void DoScroll(long nDelta);
+
+boost::signals2::signal< void ( SmElement* ) > selectedSignal;
};
class SmElementsDockingWindow : public SfxDockingWindow
@@ -131,7 +130,7 @@ class SmElementsDockingWindow : public SfxDockingWindow
virtual void Resize() SAL_OVERRIDE;
SmViewShell* GetView();
-DECL_LINK(SelectClickHdl, SmElement*);
+void SelectClickHandler(SmElement* pElement);
DECL_LINK(ElementSelectedHandle, ListBox*);
public:
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 4b2cd4a..e229828 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -415,7 +415,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent&
rMouseEvent)
Rectangle rect(element->mBoxLocation, element->mBoxSize);
if (rect.IsInside(rMouseEvent.GetPosPixel()))
{
-aSelectHdlLink.Call(element);
+selectedSignal(element);
return;
}
}
@@ -650,13 +650,12 @@
SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
}
maElementListBox.SetSelectHdl(LINK(this, SmElementsDockingWindow,
ElementSelectedHandle));
+
maElementListBox.SelectEntry(SM_RESSTR(RID_CATEGORY_UNARY_BINARY_OPERATORS));
maElementsControl.SetBackground( Color( COL_WHITE ) );
maElementsControl.SetTextColor( Color( COL_BLACK ) );
-maElementsControl.SetSelectHdl(LINK(this, SmElementsDockingWindow,
SelectClickHdl));
-
-
maElementListBox.SelectEntry(SM_RESSTR(RID_CATEGORY_UNARY_BINARY_OPERATORS));
maElementsControl.setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS);
+maElementsControl.selectedSignal.connect( boost::bind(
&SmElementsDockingWindow::SelectClickHandler, this, _1 ) );
FreeResource();
}
@@ -682,7 +681,7 @@ void SmElementsDockingWindow::EndDocking( const Rectangle&
rReactangle, bool bFl
maElementsControl.setVerticalMode(bVertical);
}
-IMPL_LINK( SmElementsDockingWindow, SelectClickHdl, SmElement*, pElement)
+void SmElementsDockingWindow::SelectClickHandler( SmElement* pElement )
{
SmViewShell* pViewSh = GetView();
@@ -692,7 +691,6 @@ IMPL_LINK( SmElementsDockingWindow, SelectClickHdl,
SmElement*, pElement)
SID_INSERTCOMMANDTEXT, SfxCallMode::RECORD,
new SfxStringItem(SID_INSERTCOMMANDTEXT, pElement->getText()), 0L);
}
-return 0;
}
IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox*, pList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/ElementsDockingWindow.cxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 2ff1cc856a1d884187d8667e4f4b24d82c56b2c4
Author: Marcos Paulo de Souza
Date: Sat Nov 15 19:57:43 2014 -0200
Math: Remove aqua and fuchsia from the Elements Dock
We can remove these colors from the UI because these colors are equal to
cyan and magenta, and will be useful just in the import/exports filters. If
the
user still wants to use aqua and fuchsia, they can type them in the Math
editor.
Change-Id: Ia93d458e07b218aa007ec43bd490f774e5b4ea5b
Reviewed-on: https://gerrit.libreoffice.org/12467
Reviewed-by: Marcos Paulo de Souza
Tested-by: Marcos Paulo de Souza
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index ac29644..4b2cd4a 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -163,8 +163,7 @@ const sal_uInt16 SmElementsControl::aAttributes[][2] =
{RID_COLORX_BLACK, RID_COLORX_BLACK_HELP}, {RID_COLORX_BLUE,
RID_COLORX_BLUE_HELP},
{RID_COLORX_GREEN, RID_COLORX_GREEN_HELP}, {RID_COLORX_RED,
RID_COLORX_RED_HELP},
{RID_COLORX_CYAN, RID_COLORX_CYAN_HELP}, {RID_COLORX_MAGENTA,
RID_COLORX_MAGENTA_HELP},
-{RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}, {RID_COLORX_AQUA,
RID_COLORX_AQUA_HELP},
-{RID_COLORX_FUCHSIA, RID_COLORX_FUCHSIA_HELP}, {RID_COLORX_GRAY,
RID_COLORX_GRAY_HELP},
+{RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}, {RID_COLORX_GRAY,
RID_COLORX_GRAY_HELP},
{RID_COLORX_LIME, RID_COLORX_LIME_HELP}, {RID_COLORX_MAROON,
RID_COLORX_MAROON_HELP},
{RID_COLORX_NAVY, RID_COLORX_NAVY_HELP}, {RID_COLORX_OLIVE,
RID_COLORX_OLIVE_HELP},
{RID_COLORX_PURPLE, RID_COLORX_PURPLE_HELP}, {RID_COLORX_SILVER,
RID_COLORX_SILVER_HELP},
@@ -516,10 +515,6 @@ void SmElementsControl::addElements(const sal_uInt16
aElementsArray[][2], sal_uI
addElement("color magenta { \"" + SM_RESSTR(STR_MAGENTA) + "\"
}", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else if (aElementId == RID_COLORX_YELLOW)
addElement("color yellow { \"" + SM_RESSTR(STR_YELLOW) + "\"
}", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
-else if (aElementId == RID_COLORX_AQUA)
-addElement("color aqua { \"" + SM_RESSTR(STR_AQUA) + "\" }",
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
-else if (aElementId == RID_COLORX_FUCHSIA)
-addElement("color fuchsia { \"" + SM_RESSTR(STR_FUCHSIA) + "\"
}", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else if (aElementId == RID_COLORX_GRAY)
addElement("color gray { \"" + SM_RESSTR(STR_GRAY) + "\" }",
SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else if (aElementId == RID_COLORX_LIME)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/starmath.hrc | 31 ++
starmath/source/ElementsDockingWindow.cxx | 27 +++
starmath/source/commands.src | 51 ++
starmath/source/smres.src | 41
4 files changed, 149 insertions(+), 1 deletion(-)
New commits:
commit 38e21f422cd5ee9ce97aae9f0be32f46f6d22904
Author: Marcos Paulo de Souza
Date: Tue Nov 4 00:14:27 2014 -0200
Math: Add new colors in the Sidebar
Regine add new colors to Math in fe5840aab17e366749c373e4f8683e06e40b4b05
and
this commit just take those new colors and show in the Math Sidebar.
Change-Id: Idd67cf4a04b2855970b115aac8d15d6506f73298
Reviewed-on: https://gerrit.libreoffice.org/12239
Reviewed-by: Marcos Paulo de Souza
Tested-by: Marcos Paulo de Souza
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index ae9cafb..e5aab19 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -113,6 +113,16 @@
#define STR_ALIGN_LEFT (RID_APP_START + 836)
#define STR_ALIGN_CENTER(RID_APP_START + 837)
#define STR_ALIGN_RIGHT (RID_APP_START + 838)
+#define STR_AQUA(RID_APP_START + 839)
+#define STR_FUCHSIA (RID_APP_START + 840)
+#define STR_GRAY(RID_APP_START + 841)
+#define STR_LIME(RID_APP_START + 842)
+#define STR_MAROON (RID_APP_START + 843)
+#define STR_NAVY(RID_APP_START + 844)
+#define STR_OLIVE (RID_APP_START + 845)
+#define STR_PURPLE (RID_APP_START + 846)
+#define STR_SILVER (RID_APP_START + 847)
+#define STR_TEAL(RID_APP_START + 848)
#define RID_ERR_IDENT (RID_APP_START + 920)
#define RID_ERR_UNKNOWN (RID_APP_START + 921)
@@ -401,6 +411,16 @@
#define RID_COLORX_CYAN (RID_APP_START + 1729)
#define RID_COLORX_MAGENTA (RID_APP_START + 1730)
#define RID_COLORX_YELLOW (RID_APP_START + 1731)
+#define RID_COLORX_AQUA (RID_APP_START + 1732)
+#define RID_COLORX_FUCHSIA (RID_APP_START + 1733)
+#define RID_COLORX_GRAY (RID_APP_START + 1734)
+#define RID_COLORX_LIME (RID_APP_START + 1735)
+#define RID_COLORX_MAROON (RID_APP_START + 1736)
+#define RID_COLORX_NAVY (RID_APP_START + 1737)
+#define RID_COLORX_OLIVE(RID_APP_START + 1738)
+#define RID_COLORX_PURPLE (RID_APP_START + 1739)
+#define RID_COLORX_SILVER (RID_APP_START + 1740)
+#define RID_COLORX_TEAL (RID_APP_START + 1741)
#define RID_LRPARENTX (RID_APP_START + 1801)
#define RID_LRBRACKETX (RID_APP_START + 1802)
@@ -676,6 +696,17 @@
#define RID_LLINT_FROMTOX_HELP (RID_APP_START + 4189)
#define RID_LLLINT_FROMTOX_HELP (RID_APP_START + 4190)
+#define RID_COLORX_AQUA_HELP(RID_APP_START + 4191)
+#define RID_COLORX_FUCHSIA_HELP (RID_APP_START + 4192)
+#define RID_COLORX_GRAY_HELP(RID_APP_START + 4193)
+#define RID_COLORX_LIME_HELP(RID_APP_START + 4194)
+#define RID_COLORX_MAROON_HELP (RID_APP_START + 4195)
+#define RID_COLORX_NAVY_HELP(RID_APP_START + 4196)
+#define RID_COLORX_OLIVE_HELP (RID_APP_START + 4197)
+#define RID_COLORX_PURPLE_HELP (RID_APP_START + 4198)
+#define RID_COLORX_SILVER_HELP (RID_APP_START + 4199)
+#define RID_COLORX_TEAL_HELP(RID_APP_START + 4200)
+
#define RID_ALIGNLX_HELP (RID_APP_START + 4275)
#define RID_ALIGNCX_HELP (RID_APP_START + 4276)
#define RID_ALIGNRX_HELP (RID_APP_START + 4277)
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 5b5a833..ac29644 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -163,7 +163,12 @@ const sal_uInt16 SmElementsControl::aAttributes[][2] =
{RID_COLORX_BLACK, RID_COLORX_BLACK_HELP}, {RID_COLORX_BLUE,
RID_COLORX_BLUE_HELP},
{RID_COLORX_GREEN, RID_COLORX_GREEN_HELP}, {RID_COLORX_RED,
RID_COLORX_RED_HELP},
{RID_COLORX_CYAN, RID_COLORX_CYAN_HELP}, {RID_COLORX_MAGENTA,
RID_COLORX_MAGENTA_HELP},
-{RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}
+{RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}, {RID_COLORX_AQUA,
RID_COLORX_AQUA_HELP},
+{RID_COLORX_FUCHSIA, RID_COLORX_FUCHSIA_HELP}, {RID_COLORX_GRAY,
RID_COLORX_GRAY_HELP},
+{RID_COLORX_LIME, RID_COLORX_LIME_HELP}, {RID_COLORX_MAROON,
RID_COLORX_MAROON_HELP},
+{RID_COLORX_NAVY, RID_COLORX_NAVY_HELP}, {RID_COLORX_OLIVE,
RID_COLORX_OLIVE_HELP},
+{RID_COLORX_PURPLE, RID_COLORX_PURPLE_HELP}, {RID_COLORX_SILVER,
RID_COLORX_SILVER_HELP
[Libreoffice-commits] core.git: basic/source desktop/source desktop/win32 solenv/gbuild solenv/inc
basic/source/runtime/methods1.cxx |3 ++-
desktop/source/app/officeipcthread.cxx |3 ++-
desktop/win32/source/officeloader/officeloader.cxx |5 -
solenv/gbuild/gbuild.mk|1 -
solenv/inc/doxygen.cfg |1 -
5 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 2e52086aa0428b6d9954a6af34febd75addb
Author: Marcos Paulo de Souza
Date: Sun Oct 12 14:49:43 2014 -0300
fdo#60689: replace SUPD variable
Change-Id: Iad63330f8762b595ba5ee94fc20bc2c64ac92f6b
Reviewed-on: https://gerrit.libreoffice.org/11937
Tested-by: LibreOffice gerrit bot
Reviewed-by: Stephan Bergmann
Tested-by: Stephan Bergmann
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 9b1ae18..acae16e 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
@@ -735,7 +736,7 @@ RTLFUNC(GetSolarVersion)
(void)pBasic;
(void)bWrite;
-rPar.Get(0)->PutLong( (sal_Int32)SUPD );
+rPar.Get(0)->PutLong( LIBO_VERSION_MAJOR * 1 + LIBO_VERSION_MINOR *
100 + LIBO_VERSION_MICRO * 1);
}
RTLFUNC(TwipsPerPixelX)
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index d636adf..2c4e9d1 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include "app.hxx"
#include "officeipcthread.hxx"
@@ -504,7 +505,7 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
if ( aPreloadData == "1" )
{
sal_CharszBuffer[32];
-sprintf( szBuffer, "%d", SUPD );
+sprintf( szBuffer, "%d", LIBO_VERSION_MAJOR * 1 +
LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1 );
aUserInstallPathHashCode = OUString( szBuffer, strlen(szBuffer),
osl_getThreadTextEncoding() );
}
else
diff --git a/desktop/win32/source/officeloader/officeloader.cxx
b/desktop/win32/source/officeloader/officeloader.cxx
index ff95bc4..7f820c2 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -46,6 +46,8 @@
#include "../../../source/inc/exithelper.h"
#include "../extendloaderenvironment.hxx"
+#include
+
#define PIPE_PREFIX TEXT(".\\pipe\\OSL_PIPE_")
#define PIPE_POSTFIXTEXT("_SingleOfficeIPC_")
#define PIPE_TERMINATION_SEQUENCE "InternalIPC::ProcessingDone"
@@ -250,7 +252,8 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
_tcsncpy( szPipeName, PIPE_PREFIX, SAL_N_ELEMENTS(szPipeName)
);
_tcsncat( szPipeName, szUserIdent, SAL_N_ELEMENTS(szPipeName)
- _tcslen(szPipeName) - 1 );
_tcsncat( szPipeName, PIPE_POSTFIX, SAL_N_ELEMENTS(szPipeName)
- _tcslen(szPipeName) - 1 );
-_tcsncat( szPipeName, _ultot( SUPD, szSUPD, 10),
SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 );
+_tcsncat( szPipeName, _ultot( LIBO_VERSION_MAJOR * 1 +
LIBO_VERSION_MINOR * 100 + LIBO_VERSION_MICRO * 1
+, szSUPD, 10),
SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 );
LocalFree( szUserIdent );
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 3145540..fbf13fe 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -206,7 +206,6 @@ gb_CPUDEFS += -D$(CPUNAME)
gb_GLOBALDEFS := \
-D_REENTRANT \
-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
- -DSUPD=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)0 \
$(gb_OSDEFS) \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index c501e25..eff9645 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1615,7 +1615,6 @@ PREDEFINED = LINUX \
NEW_SOLAR \
_USE_NAMESPACE=1 \
UNIX \
- SUPD=300 \
DEBUG \
DBG_UTIL \
OSL_DEBUG_LEVEL=2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: VS2013: improved C++11 conformance
Hi David, On 12-10-2014 06:31, David Ostrovsky wrote: Recently compiler baseline was raised to VS 2012 to use improved C++11 conformance. It turns out that VS2013 has much more C++11 features [1]: * Default template arguments for function templates * Delegating constructors * Explicit conversion operators * Initializer lists and uniform initialization I created a patch using initializer list and it seems VS 2012 does not have this feature. Stephan also did another patch using this C++11, and the buildbot with VS2012 didn't like it. This is the patch: https://gerrit.libreoffice.org/#/c/11872/ * Raw string literals * Variadic templates I wonder if we could raise VS baseline again and require VS2013. Particularly this change compiles without problems on VS2013 [2]. [1] http://blogs.msdn.com/b/vcblog/archive/2013/06/28/c-11-14-stl-features-fixes-and-breaking-changes-in-vs-2013.aspx [2] https://gerrit.libreoffice.org/11872 David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/56/6456/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/changes/84/2484/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/changes/84/2484/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/2453/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/18/4118/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/05/4105/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/3085/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/changes/84/2484/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/59/7959/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/99/10599/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/05/4105/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/19/4119/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/9894/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/3085/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/58/7258/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/19/4119/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/59/7959/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/21/4121/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/59/7959/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/8503/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/1751/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/20/6120/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/8503/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/58/7258/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/40/6440/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/05/4105/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/1074/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/84/9884/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/4369/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/changes/84/2484/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/50/3850/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/8503/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4153/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/12/1012/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/18/4118/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/10523/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/4369/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/40/6440/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/2617/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/5986/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/7768/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/875/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/3467/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/4369/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/1751/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4153/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/7768/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4153/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/8503/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/50/3850/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/68/7768/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/1727/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/2617/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/977/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/2292/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/1727/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/4153/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
