LibreOffice Gerrit News for core on 2014-08-18
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Change inline-edit mouse input handling in https://gerrit.libreoffice.org/10836 from Jan-Marek Glogowski about module build, sw End of freshness + Treeview may lose focus when left/right arrow is used in https://gerrit.libreoffice.org/10956 from Niklas Johansson about module svtools + Resolves: fdo#79172 dev builds were misleadingly labeled 'beta' in https://gerrit.libreoffice.org/10313 from Adolfo Jayme Barrientos about module icon-themes + fdo#56456 fdo#75578 fdo#63271 fdo#75805 Improve hyperlink dialog in https://gerrit.libreoffice.org/10946 from Thomas Arnhold about module cui + vcl: use enum for complex text layout constants in https://gerrit.libreoffice.org/10676 from Noel Grandin about module canvas, cppcanvas, drawinglayer, editeng, include, sc, starmath, svx, sw, vcl * Merged changes on master for project core changed in the last 25 hours: + Fix input field tab handling in https://gerrit.libreoffice.org/10837 from Jan-Marek Glogowski + fdo#76565 Allow pasting into input fields in https://gerrit.libreoffice.org/10835 from Jan-Marek Glogowski + fdo#81750 MM: correctly convert inline-edit fields in https://gerrit.libreoffice.org/10834 from Jan-Marek Glogowski + Input fields are always editable... in https://gerrit.libreoffice.org/10833 from Jan-Marek Glogowski + fdo#72333 Changed [T] description to reduce confusion. in https://gerrit.libreoffice.org/10953 from Rachit Gupta + Access2Base - non-Base components in https://gerrit.libreoffice.org/10883 from Jean-Pierre Ledure * Abandoned changes on master for project core changed in the last 25 hours: + Rel fdo#48068: fix errors when 2 decimals in svg path position in https://gerrit.libreoffice.org/10544 from Joren De Cuyper * Open changes needing tweaks, but being untouched for more than a week: + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#82290: Perform write(2) and read(2) concurrently to avoid pipe deadlo in https://gerrit.libreoffice.org/10825 from Jan Holesovsky + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-3' - source/sl
source/sl/chart2/uiconfig/ui.po | 74 source/sl/cui/uiconfig/ui.po| 11 source/sl/sd/source/ui/app.po | 14 +++--- source/sl/starmath/uiconfig/smath/ui.po | 10 ++-- source/sl/svx/source/dialog.po |4 - source/sl/sw/uiconfig/swriter/ui.po | 34 +++--- 6 files changed, 24 insertions(+), 123 deletions(-) New commits: commit c05911bb115479f0ae29e30a4d8a91eb3c55f81e Author: Andras Timar andras.ti...@collabora.com Date: Mon Aug 18 08:11:03 2014 +0200 Updated Slovenian translation Change-Id: I911716830bfca9b72279b5dcb98306eb7e57268f diff --git a/source/sl/chart2/uiconfig/ui.po b/source/sl/chart2/uiconfig/ui.po index 6ac7fbe..97e4267 100644 --- a/source/sl/chart2/uiconfig/ui.po +++ b/source/sl/chart2/uiconfig/ui.po @@ -3,7 +3,7 @@ msgid msgstr Project-Id-Version: LibreOffice 4.3\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-06-06 11:52+0200\n +POT-Creation-Date: 2014-08-16 17:19+0200\n PO-Revision-Date: 2014-05-16 19:06+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n @@ -710,69 +710,6 @@ msgctxt msgid Position msgstr Položaj -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -PropertyMappingDialog\n -title\n -string.text -msgid Add Property Mapping -msgstr Dodaj preslikovanje lastnosti - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -ok\n -label\n -string.text -msgid Ok -msgstr V redu - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -cancel\n -label\n -string.text -msgid Cancel -msgstr PrekliÄi - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_TITLE\n -label\n -string.text -msgid Select property mapping: -msgstr Izberite preslikovanje lastnosti: - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_COLOR\n -label\n -string.text -msgid Color -msgstr Barva - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_FILLCOLOR\n -label\n -string.text -msgid FillColor -msgstr Barva polnila - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_BORDERCOLOR\n -label\n -string.text -msgid BorderColor -msgstr Barva obrobe - #: insertaxisdlg.ui msgctxt insertaxisdlg.ui\n @@ -2375,15 +2312,6 @@ msgctxt msgid Data _labels msgstr Oz_nake podatkov -#: tp_DataSource.ui -msgctxt -tp_DataSource.ui\n -BTN_ADD_MAPPING\n -label\n -string.text -msgid Add property mapping -msgstr Dodaj preslikovanje lastnosti - #: tp_ErrorBars.ui msgctxt tp_ErrorBars.ui\n diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po index 11dd03d..52a626d 100644 --- a/source/sl/cui/uiconfig/ui.po +++ b/source/sl/cui/uiconfig/ui.po @@ -3,7 +3,7 @@ msgid msgstr Project-Id-Version: LibreOffice 4.3\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-07-11 13:43+0200\n +POT-Creation-Date: 2014-08-16 17:19+0200\n PO-Revision-Date: 2014-06-08 11:35+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n @@ -71,15 +71,6 @@ msgctxt msgid Value msgstr Vrednost -#: aboutconfigdialog.ui -msgctxt -aboutconfigdialog.ui\n -label1\n -label\n -string.text -msgid Preferences -msgstr Nastavitve - #: aboutconfigvaluedialog.ui msgctxt aboutconfigvaluedialog.ui\n diff --git a/source/sl/sd/source/ui/app.po b/source/sl/sd/source/ui/app.po index eb73f8c..d0a3efd 100644 --- a/source/sl/sd/source/ui/app.po +++ b/source/sl/sd/source/ui/app.po @@ -3,14 +3,14 @@ msgid msgstr Project-Id-Version: LibreOffice 4.3\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-06-06 11:52+0200\n -PO-Revision-Date: 2014-05-31 12:05+0200\n +POT-Creation-Date: 2014-08-16 17:19+0200\n +PO-Revision-Date: 2014-08-17 00:04+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n +Language: sl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: sl\n Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Generator: Virtaal 0.7.1\n X-Accelerator-Marker: ~\n @@ -1732,8 +1732,8 @@ msgctxt res_bmp.src\n SfxStyleFamiliesRes1\n #define.text -msgid Image Styles -msgstr Slogi slike +msgid Drawing Object Styles +msgstr Slogi risanega predmeta #: res_bmp.src msgctxt @@ -4010,8 +4010,8 @@ msgctxt strings.src\n STR_GRAPHICS_STYLE_FAMILY\n string.text -msgid Image Styles -msgstr Slogi slike +msgid Drawing Object Styles +msgstr Slogi risanega predmeta #: strings.src msgctxt diff --git a/source/sl/starmath/uiconfig/smath/ui.po b/source/sl/starmath/uiconfig/smath/ui.po index
[Libreoffice-commits] core.git: Branch 'feature/mac-opengl-fixes' - canvas/source
canvas/source/factory/cf_service.cxx| 26
canvas/source/opengl/ogl_canvashelper.cxx |5 ++--
canvas/source/opengl/ogl_spritedevicehelper.cxx |1
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit a910eafd2bd46746616321db90d510d9242dc6f6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Aug 18 08:07:04 2014 +0200
some temporary debug output
diff --git a/canvas/source/factory/cf_service.cxx
b/canvas/source/factory/cf_service.cxx
index e9c3157..07ee8b7 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -169,6 +169,11 @@ CanvasFactory::CanvasFactory( ReferenceXComponentContext
const xContext ) :
xNameAccess, UNO_QUERY_THROW);
SequenceOUString serviceNames = xNameAccess-getElementNames();
+for (sal_Int32 i = 0; i serviceNames.getLength(); ++i)
+{
+SAL_DEBUG(serviceNames[i]);
+}
+
const OUString* pCurr = serviceNames.getConstArray();
const OUString* const pEnd = pCurr + serviceNames.getLength();
while( pCurr != pEnd )
@@ -181,11 +186,30 @@ CanvasFactory::CanvasFactory(
ReferenceXComponentContext const xContext ) :
{
SequenceOUString implementationList;
if( (xEntryNameAccess-getByName(PreferredImplementations)
= implementationList) )
+{
m_aAvailableImplementations.push_back(
std::make_pair(*pCurr,implementationList) );
+for (sal_Int32 i = 0; i implementationList.getLength();
++i)
+{
+SAL_DEBUG(available : implementationList[i]);
+}
+}
if( (xEntryNameAccess-getByName(AcceleratedImplementations)
= implementationList) )
+{
+for (sal_Int32 i = 0; i implementationList.getLength();
++i)
+{
+SAL_DEBUG(accelerated: implementationList[i]);
+}
m_aAcceleratedImplementations.push_back(
std::make_pair(*pCurr,implementationList) );
+}
if(
(xEntryNameAccess-getByName(AntialiasingImplementations) =
implementationList) )
+{
+for (sal_Int32 i = 0; i implementationList.getLength();
++i)
+{
+SAL_DEBUG(aa implemented: implementationList[i]);
+}
m_aAAImplementations.push_back(
std::make_pair(*pCurr,implementationList) );
+}
+
}
++pCurr;
@@ -270,6 +294,7 @@ ReferenceXInterface CanvasFactory::use(
ReferenceXComponentContext const xContext ) const
{
try {
+SAL_DEBUG(use: serviceName);
return
m_xContext-getServiceManager()-createInstanceWithArgumentsAndContext(
serviceName, args, xContext);
}
@@ -312,6 +337,7 @@ ReferenceXInterface CanvasFactory::lookupAndUse(
ReferenceXComponentContext const xContext ) const
{
::osl::MutexGuard guard(m_mutex);
+SAL_DEBUG(serviceName);
// forcing last entry from impl list, if config flag set
bool bForceLastEntry(false);
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx
b/canvas/source/opengl/ogl_canvashelper.cxx
index a5ee6bc6..29c8ca6 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -967,8 +967,9 @@ namespace oglcanvas
break;
}
-o_action.maARGBColor =
-
mpDevice-getDeviceColorSpace()-convertToARGB(renderState.DeviceColor)[0];
+if (renderState.DeviceColor.getLength())
+o_action.maARGBColor =
+
mpDevice-getDeviceColorSpace()-convertToARGB(renderState.DeviceColor)[0];
}
void CanvasHelper::flush() const
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 58a59ea..2e4b592 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -389,6 +389,7 @@ namespace oglcanvas
uno::Referencerendering::XColorSpace SpriteDeviceHelper::getColorSpace()
const
{
+SAL_DEBUG(called SpriteDeviceHelper::getColorSpace());
// always the same
return uno::Referencerendering::XColorSpace(
::canvas::tools::getStdColorSpace(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f45b0fb67583cfffbde43551794cbd249461a76b Author: Andras Timar andras.ti...@collabora.com Date: Mon Aug 18 08:11:03 2014 +0200 Updated core Project: translations c05911bb115479f0ae29e30a4d8a91eb3c55f81e diff --git a/translations b/translations index bd4df3d..c05911b 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit bd4df3d8b26cd109911f8a3fc56fc99aa8704503 +Subproject commit c05911bb115479f0ae29e30a4d8a91eb3c55f81e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/orcus-continuous-integration' - 2 commits - sc/source
sc/source/filter/orcus/interface.cxx | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 4e06c756af82d7b972397b54066360b2554d8869
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Aug 18 07:56:31 2014 +0200
add more orcus debug output
Change-Id: I6f9135d0532026dffbb43c3b32d32cfc811a5823
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index b6bdeaa..c0c74f9 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -683,24 +683,31 @@ ScOrcusAutoFilter::~ScOrcusAutoFilter()
{
}
-void ScOrcusAutoFilter::set_range(const char* /*p_ref*/, size_t /*n_ref*/)
+void ScOrcusAutoFilter::set_range(const char* p_ref, size_t n_ref)
{
+OUString aRange(p_ref, n_ref, RTL_TEXTENCODING_UTF8);
+SAL_INFO(sc.orcus.autofilter, set_range: aRange);
}
-void ScOrcusAutoFilter::set_column(orcus::spreadsheet::col_t /*col*/)
+void ScOrcusAutoFilter::set_column(orcus::spreadsheet::col_t col)
{
+SAL_INFO(sc.orcus.autofilter, set_column: col);
}
-void ScOrcusAutoFilter::append_column_match_value(const char* /*p*/, size_t
/*n*/)
+void ScOrcusAutoFilter::append_column_match_value(const char* p, size_t n)
{
+OUString aString(p, n, RTL_TEXTENCODING_UTF8);
+SAL_INFO(sc.orcus.autofilter, append_column_match_value: aString);
}
void ScOrcusAutoFilter::commit_column()
{
+SAL_INFO(sc.orcus.autofilter, commit column);
}
void ScOrcusAutoFilter::commit()
{
+SAL_INFO(sc.orcus.autofilter, commit);
}
ScOrcusTable::ScOrcusTable(SCTAB nTab):
commit 5cd9ac91d0102acf844f16409b0487d483089026
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Aug 18 07:51:05 2014 +0200
add ScOrcusSheet::get_table method
Change-Id: I2369e29e96cf33dbe263b090dee0d1100ecce8de
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index f475327..b6bdeaa 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -215,6 +215,11 @@ void ScOrcusSheet::cellInserted()
}
}
+os::iface::import_table* ScOrcusSheet::get_table()
+{
+return NULL;
+}
+
void ScOrcusSheet::set_auto(os::row_t row, os::col_t col, const char* p,
size_t n)
{
OUString aVal(p, n, RTL_TEXTENCODING_UTF8);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-3-1' - source/sl
source/sl/chart2/uiconfig/ui.po | 74 source/sl/cui/uiconfig/ui.po| 11 source/sl/sd/source/ui/app.po | 14 +++--- source/sl/starmath/uiconfig/smath/ui.po | 10 ++-- source/sl/svx/source/dialog.po |4 - source/sl/sw/uiconfig/swriter/ui.po | 34 +++--- 6 files changed, 24 insertions(+), 123 deletions(-) New commits: commit 970cab80f1c745ac81151777289c79341eefe9d3 Author: Andras Timar andras.ti...@collabora.com Date: Mon Aug 18 08:11:03 2014 +0200 Updated Slovenian translation Change-Id: I911716830bfca9b72279b5dcb98306eb7e57268f (cherry picked from commit c05911bb115479f0ae29e30a4d8a91eb3c55f81e) diff --git a/source/sl/chart2/uiconfig/ui.po b/source/sl/chart2/uiconfig/ui.po index 6ac7fbe..97e4267 100644 --- a/source/sl/chart2/uiconfig/ui.po +++ b/source/sl/chart2/uiconfig/ui.po @@ -3,7 +3,7 @@ msgid msgstr Project-Id-Version: LibreOffice 4.3\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-06-06 11:52+0200\n +POT-Creation-Date: 2014-08-16 17:19+0200\n PO-Revision-Date: 2014-05-16 19:06+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n @@ -710,69 +710,6 @@ msgctxt msgid Position msgstr Položaj -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -PropertyMappingDialog\n -title\n -string.text -msgid Add Property Mapping -msgstr Dodaj preslikovanje lastnosti - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -ok\n -label\n -string.text -msgid Ok -msgstr V redu - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -cancel\n -label\n -string.text -msgid Cancel -msgstr PrekliÄi - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_TITLE\n -label\n -string.text -msgid Select property mapping: -msgstr Izberite preslikovanje lastnosti: - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_COLOR\n -label\n -string.text -msgid Color -msgstr Barva - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_FILLCOLOR\n -label\n -string.text -msgid FillColor -msgstr Barva polnila - -#: dlg_PropertyMapping.ui -msgctxt -dlg_PropertyMapping.ui\n -LB_BORDERCOLOR\n -label\n -string.text -msgid BorderColor -msgstr Barva obrobe - #: insertaxisdlg.ui msgctxt insertaxisdlg.ui\n @@ -2375,15 +2312,6 @@ msgctxt msgid Data _labels msgstr Oz_nake podatkov -#: tp_DataSource.ui -msgctxt -tp_DataSource.ui\n -BTN_ADD_MAPPING\n -label\n -string.text -msgid Add property mapping -msgstr Dodaj preslikovanje lastnosti - #: tp_ErrorBars.ui msgctxt tp_ErrorBars.ui\n diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po index 11dd03d..52a626d 100644 --- a/source/sl/cui/uiconfig/ui.po +++ b/source/sl/cui/uiconfig/ui.po @@ -3,7 +3,7 @@ msgid msgstr Project-Id-Version: LibreOffice 4.3\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-07-11 13:43+0200\n +POT-Creation-Date: 2014-08-16 17:19+0200\n PO-Revision-Date: 2014-06-08 11:35+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n @@ -71,15 +71,6 @@ msgctxt msgid Value msgstr Vrednost -#: aboutconfigdialog.ui -msgctxt -aboutconfigdialog.ui\n -label1\n -label\n -string.text -msgid Preferences -msgstr Nastavitve - #: aboutconfigvaluedialog.ui msgctxt aboutconfigvaluedialog.ui\n diff --git a/source/sl/sd/source/ui/app.po b/source/sl/sd/source/ui/app.po index eb73f8c..d0a3efd 100644 --- a/source/sl/sd/source/ui/app.po +++ b/source/sl/sd/source/ui/app.po @@ -3,14 +3,14 @@ msgid msgstr Project-Id-Version: LibreOffice 4.3\n Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n; -POT-Creation-Date: 2014-06-06 11:52+0200\n -PO-Revision-Date: 2014-05-31 12:05+0200\n +POT-Creation-Date: 2014-08-16 17:19+0200\n +PO-Revision-Date: 2014-08-17 00:04+0200\n Last-Translator: Martin Srebotnjak mi...@filmsi.net\n Language-Team: sl.libreoffice.org\n +Language: sl\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: sl\n Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n X-Generator: Virtaal 0.7.1\n X-Accelerator-Marker: ~\n @@ -1732,8 +1732,8 @@ msgctxt res_bmp.src\n SfxStyleFamiliesRes1\n #define.text -msgid Image Styles -msgstr Slogi slike +msgid Drawing Object Styles +msgstr Slogi risanega predmeta #: res_bmp.src msgctxt @@ -4010,8 +4010,8 @@ msgctxt strings.src\n STR_GRAPHICS_STYLE_FAMILY\n string.text -msgid Image Styles -msgstr Slogi slike +msgid Drawing Object Styles +msgstr Slogi risanega predmeta #: strings.src msgctxt diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7e556e7dac1ef28f981d76eb3f62327166a94f76 Author: Andras Timar andras.ti...@collabora.com Date: Mon Aug 18 08:11:03 2014 +0200 Updated core Project: translations 970cab80f1c745ac81151777289c79341eefe9d3 diff --git a/translations b/translations index 2ad7e26..970cab8 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 2ad7e26cd290c6aabf99862ae25af48b8cf50626 +Subproject commit 970cab80f1c745ac81151777289c79341eefe9d3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source
sd/source/filter/ppt/pptin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54fc725712b3dbad88b6ff9916b1561ad0806bb4
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 17 19:21:52 2014 +0100
check TRG_HasMasterPage before TRG_GetMasterPage
bff + valgrind
Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3
(cherry picked from commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0)
Reviewed-on: https://gerrit.libreoffice.org/10955
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 80653bc..de1c9ef 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2388,7 +2388,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
}
pPresObj-SetMergedItemSet(aSet);
-if ( ( eAktPageKind != PPT_NOTEPAGE ) (
nPlacementId != 0x ) )
+if ((eAktPageKind != PPT_NOTEPAGE)
(nPlacementId != 0x) pPage-TRG_HasMasterPage())
{
SdrObject* pTitleObj =
((SdPage)pPage-TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE );
SdrObject* pOutlineObj =
((SdPage)pPage-TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source
sd/source/filter/ppt/pptin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4138d34dedc614d98b783d4286cb0fd87c3b844d
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 17 19:21:52 2014 +0100
check TRG_HasMasterPage before TRG_GetMasterPage
bff + valgrind
Change-Id: Ie08ddfe06dc0850cf44955cc9f9079b3856b19e3
(cherry picked from commit fad62d928a4b4cd3aa96e16d7ab8f8db0331b8c0)
Reviewed-on: https://gerrit.libreoffice.org/10954
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index da9428c..b8aa216 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2409,7 +2409,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
}
pPresObj-SetMergedItemSet(aSet);
-if ( ( eAktPageKind != PPT_NOTEPAGE ) (
nPlacementId != 0x ) )
+if ((eAktPageKind != PPT_NOTEPAGE)
(nPlacementId != 0x) pPage-TRG_HasMasterPage())
{
SdrObject* pTitleObj =
((SdPage)pPage-TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE );
SdrObject* pOutlineObj =
((SdPage)pPage-TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-opencl-cache' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-moggi' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cond-format-rework' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/filter/igif/decode.cxx | 26 ++
vcl/source/filter/igif/decode.hxx |2 +-
2 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit feb51015416c5ccceff0d74f7d0305f87febe75b
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 17 16:14:16 2014 +0100
check that AddToTable can be done validly
Change-Id: I0ee69279e3bb1d9871feba17b908b8307f0ec5b4
(cherry picked from commit 43b39d3e47ffd179071732c0a8fc201c31b2bb46)
Reviewed-on: https://gerrit.libreoffice.org/10950
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index 5900b4c..1418c3a 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -49,12 +49,14 @@ GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize
) :
pTable = new GIFLZWTableEntry[ 4098 ];
-for( sal_uInt16 i = 0; i nTableSize; i++ )
+for (sal_uInt16 i = 0; i nTableSize; ++i)
{
pTable[i].pPrev = NULL;
pTable[i].pFirst = pTable + i;
pTable[i].nData = (sal_uInt8) i;
}
+
+memset(pTable + nTableSize, 0, sizeof(GIFLZWTableEntry) * (4098 -
nTableSize));
}
//
@@ -111,9 +113,7 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc,
sal_uInt8 cBufSize,
return pTarget;
}
-//
-
-void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData )
+bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData )
{
GIFLZWTableEntry* pE;
@@ -122,12 +122,16 @@ void GIFLZWDecompressor::AddToTable( sal_uInt16
nPrevCode, sal_uInt16 nCodeFirst
pE = pTable + nTableSize;
pE-pPrev = pTable + nPrevCode;
pE-pFirst = pE-pPrev-pFirst;
-pE-nData = pTable[ nCodeFirstData ].pFirst-nData;
+GIFLZWTableEntry *pEntry = pTable[nCodeFirstData].pFirst;
+if (!pEntry)
+return false;
+pE-nData = pEntry-nData;
nTableSize++;
if ( ( nTableSize == (sal_uInt16) (1 nCodeSize) ) ( nTableSize
4096 ) )
nCodeSize++;
}
+return true;
}
//
@@ -161,17 +165,23 @@ bool GIFLZWDecompressor::ProcessOneCode()
if ( nCode nClearCode )
{
+bool bOk = true;
if ( nOldCode != 0x )
-AddToTable( nOldCode, nCode );
+bOk = AddToTable(nOldCode, nCode);
+if (!bOk)
+return false;
}
else if ( ( nCode nEOICode ) ( nCode = nTableSize ) )
{
if ( nOldCode != 0x )
{
+bool bOk;
if ( nCode == nTableSize )
-AddToTable( nOldCode, nOldCode );
+bOk = AddToTable( nOldCode, nOldCode );
else
-AddToTable( nOldCode, nCode );
+bOk = AddToTable( nOldCode, nCode );
+if (!bOk)
+return false;
}
}
else
diff --git a/vcl/source/filter/igif/decode.hxx
b/vcl/source/filter/igif/decode.hxx
index 3e1a783..737a495 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -43,7 +43,7 @@ class GIFLZWDecompressor
sal_uInt8 nBlockBufSize;
sal_uInt8 nBlockBufPos;
-voidAddToTable(sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData);
+boolAddToTable(sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData);
boolProcessOneCode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/freetype-buildsystem' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source
vcl/source/filter/igif/decode.cxx | 24 ++--
vcl/source/filter/igif/decode.hxx |2 +-
2 files changed, 19 insertions(+), 7 deletions(-)
New commits:
commit 55fd7b2d236dc6dc09676b7dce60dc4e2e1786fc
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 17 16:14:16 2014 +0100
check that AddToTable can be done validly
Change-Id: I0ee69279e3bb1d9871feba17b908b8307f0ec5b4
(cherry picked from commit 43b39d3e47ffd179071732c0a8fc201c31b2bb46)
Reviewed-on: https://gerrit.libreoffice.org/10949
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index 85b417c..d50ac7c 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -47,12 +47,14 @@ GIFLZWDecompressor::GIFLZWDecompressor(sal_uInt8 cDataSize)
pTable = new GIFLZWTableEntry[ 4098 ];
-for( sal_uInt16 i = 0; i nTableSize; i++ )
+for (sal_uInt16 i = 0; i nTableSize; ++i)
{
pTable[i].pPrev = NULL;
pTable[i].pFirst = pTable + i;
pTable[i].nData = (sal_uInt8) i;
}
+
+memset(pTable + nTableSize, 0, sizeof(GIFLZWTableEntry) * (4098 -
nTableSize));
}
GIFLZWDecompressor::~GIFLZWDecompressor()
@@ -105,7 +107,7 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc,
sal_uInt8 cBufSize,
return pTarget;
}
-void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData )
+bool GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData )
{
GIFLZWTableEntry* pE;
@@ -114,12 +116,16 @@ void GIFLZWDecompressor::AddToTable( sal_uInt16
nPrevCode, sal_uInt16 nCodeFirst
pE = pTable + nTableSize;
pE-pPrev = pTable + nPrevCode;
pE-pFirst = pE-pPrev-pFirst;
-pE-nData = pTable[ nCodeFirstData ].pFirst-nData;
+GIFLZWTableEntry *pEntry = pTable[nCodeFirstData].pFirst;
+if (!pEntry)
+return false;
+pE-nData = pEntry-nData;
nTableSize++;
if ( ( nTableSize == (sal_uInt16) (1 nCodeSize) ) ( nTableSize
4096 ) )
nCodeSize++;
}
+return true;
}
bool GIFLZWDecompressor::ProcessOneCode()
@@ -151,17 +157,23 @@ bool GIFLZWDecompressor::ProcessOneCode()
if ( nCode nClearCode )
{
+bool bOk = true;
if ( nOldCode != 0x )
-AddToTable( nOldCode, nCode );
+bOk = AddToTable(nOldCode, nCode);
+if (!bOk)
+return false;
}
else if ( ( nCode nEOICode ) ( nCode = nTableSize ) )
{
if ( nOldCode != 0x )
{
+bool bOk;
if ( nCode == nTableSize )
-AddToTable( nOldCode, nOldCode );
+bOk = AddToTable( nOldCode, nOldCode );
else
-AddToTable( nOldCode, nCode );
+bOk = AddToTable( nOldCode, nCode );
+if (!bOk)
+return false;
}
}
else
diff --git a/vcl/source/filter/igif/decode.hxx
b/vcl/source/filter/igif/decode.hxx
index 5425326..ee093bf 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -43,7 +43,7 @@ class GIFLZWDecompressor
sal_uInt8 nBlockBufSize;
sal_uInt8 nBlockBufPos;
-voidAddToTable(sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData);
+boolAddToTable(sal_uInt16 nPrevCode, sal_uInt16
nCodeFirstData);
boolProcessOneCode();
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/hidemark.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 48 +++
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
writerfilter/source/dmapper/TablePropertiesHandler.cxx |8 ++
6 files changed, 71 insertions(+)
New commits:
commit eff81a79fa09ce17ba77319b01e8a91a805a42c0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Aug 14 13:54:18 2014 +0200
bnc#865381 DOCX import: handle w:hideMark table cell property
(cherry picked from commit d1278ef4849661b9ae0eb7aaf4d74fbf91ccaf11)
Conflicts:
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx
Change-Id: Id0dd34110376168e34df4956869608895b86abfe
Reviewed-on: https://gerrit.libreoffice.org/10922
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/qa/extras/ooxmlimport/data/hidemark.docx
b/sw/qa/extras/ooxmlimport/data/hidemark.docx
new file mode 100644
index 000..4a273d6
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/hidemark.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1dc6161..fb82c8f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2220,6 +2220,19 @@
DECLARE_OOXMLIMPORT_TEST(testFloatingTableSectionColumns, floating-table-sectio
CPPUNIT_ASSERT( tableWidth.toInt32() 1 );
}
+DECLARE_OOXMLIMPORT_TEST(testHidemark, hidemark.docx)
+{
+// Problem was that w:hideMark cell property was ignored.
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTextTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetable::XTableRows xTableRows(xTextTable-getRows(),
uno::UNO_QUERY);
+// Height should be minimal
+CPPUNIT_ASSERT_EQUAL(convertTwipToMm100(MINLAY),
getPropertysal_Int64(xTableRows-getByIndex(1), Height));
+// Size type was MIN, should be FIX to avoid considering the end of
paragraph marker.
+CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX,
getPropertysal_Int16(xTableRows-getByIndex(1), SizeType));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index a8650a5..33f70cc 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -29,9 +29,11 @@
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/SizeType.hpp
#include com/sun/star/text/VertOrientation.hpp
+#include com/sun/star/text/XTextRangeCompare.hpp
#include com/sun/star/style/ParagraphAdjust.hpp
#include dmapperLoggers.hxx
#include TablePositionHandler.hxx
+#include ConversionHelper.hxx
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
#include PropertyMapHelper.hxx
@@ -886,12 +888,50 @@ CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(Tabl
return aCellProperties;
}
+/// Do all cells in this row have a CellHideMark property?
+bool lcl_hideMarks(PropertyMapVector1 rCellProperties)
+{
+for (size_t nCell = 0; nCell rCellProperties.size(); ++nCell)
+if (rCellProperties[nCell]-find(PROP_CELL_HIDE_MARK) ==
rCellProperties[nCell]-end())
+return false;
+return true;
+}
+
+/// Are all cells in this row empty?
+bool lcl_emptyRow(TableSequence_t rTableSeq, sal_Int32 nRow)
+{
+if (nRow = rTableSeq.getLength())
+{
+SAL_WARN(writerfilter, m_aCellProperties not in sync with
m_pTableSeq?);
+return false;
+}
+
+RowSequence_t rRowSeq = rTableSeq[nRow];
+uno::Referencetext::XTextRangeCompare
xTextRangeCompare(rRowSeq[0][0]-getText(), uno::UNO_QUERY);
+try
+{
+for (sal_Int32 nCell = 0; nCell rRowSeq.getLength(); ++nCell)
+// See SwXText::Impl::ConvertCell(), we need to compare the start
of
+// the start and the end of the end. However for our text ranges,
only
+// the starts are set, so compareRegionStarts() does what we need.
+if (xTextRangeCompare-compareRegionStarts(rRowSeq[nCell][0],
rRowSeq[nCell][1]) != 0)
+return false;
+}
+catch (lang::IllegalArgumentException e)
+{
+SAL_WARN(writerfilter, compareRegionStarts() failed:
e.Message);
+return false;
+}
+return true;
+}
+
RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
{
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger-startElement(getRowProperties);
#endif
+
[Libreoffice-commits] core.git: Branch 'feature/inherited-number-format-removal' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/screen-rendering' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/opengl-3D-bar-rendering' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/windows-repaint-fix' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/document10.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 3dc5743ad17fed7cc05a90457e6c0b92eb9cb460
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Sat Aug 16 03:07:07 2014 +0200
copy conditional formatting for single cells, fdo#82503
Change-Id: I22f239fbbbfa3ac562b860efb990dff10d0e0e24
Reviewed-on: https://gerrit.libreoffice.org/10942
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index 3629d4d..e468dd3 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -202,7 +202,12 @@ bool ScDocument::CopyOneCellFromClip(
SCTAB nTabEnd = rCxt.getTabEnd();
for (SCTAB i = rCxt.getTabStart(); i = nTabEnd i
static_castSCTAB(maTabs.size()); ++i)
+{
maTabs[i]-CopyOneCellFromClip(rCxt, nCol1, nRow1, nCol2, nRow2);
+if (rCxt.getInsertFlag() IDF_ATTRIB)
+maTabs[i]-CopyConditionalFormat(nCol1, nRow1, nCol2, nRow2, nCol1
- aClipRange.aStart.Col(),
+nRow1 - aClipRange.aStart.Row(), pSrcTab);
+}
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libgltf
external/libgltf/patches/append_shader_version.patch | 31 +++
1 file changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 6be202585f201deaf07c57e0f2cf722cce91165e
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 18 09:24:23 2014 +0200
libgltf: check for #version string in the shader before add an own one.
Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf
diff --git a/external/libgltf/patches/append_shader_version.patch
b/external/libgltf/patches/append_shader_version.patch
index dd79515..27f0cc6 100644
--- a/external/libgltf/patches/append_shader_version.patch
+++ b/external/libgltf/patches/append_shader_version.patch
@@ -1,6 +1,6 @@
diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
libgltf.org/src/Shaders.cpp2014-08-17 09:15:17.379255115 +0200
-+++ libgltf/src/Shaders.cpp2014-08-17 09:16:43.323258781 +0200
+--- libgltf.org/src/Shaders.cpp2014-08-18 09:19:48.323955939 +0200
libgltf/src/Shaders.cpp2014-08-18 09:20:46.711953465 +0200
@@ -11,6 +11,7 @@
#include GL/glew.h
@@ -9,22 +9,29 @@ diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
namespace libgltf
{
-@@ -166,7 +167,17 @@
+@@ -166,7 +167,24 @@
unsigned int shaderId)
{
GLint iGLSize = iSize;
-glShaderSource(shaderId, 1, pShader, iGLSize);
-+const GLchar* aSources[] = {
-+#version 130\n,
-+pShader,
-+};
++if( strstr(pShader,#version) == 0 )
++{
++const GLchar* aSources[] = {
++#version 130\n,
++pShader,
++};
+
-+const GLint aSizes[] = {
-+strlen(#version 130\n),
-+iGLSize,
-+};
++const GLint aSizes[] = {
++strlen(#version 130\n),
++iGLSize,
++};
+
-+glShaderSource(shaderId, 2, aSources[0], aSizes[0]);
++glShaderSource(shaderId, 2, aSources[0], aSizes[0]);
++}
++else
++{
++glShaderSource(shaderId, 1, pShader, iGLSize);
++}
glCompileShader(shaderId);
int iStatus = 0;
glGetShaderiv(shaderId, GL_COMPILE_STATUS, iStatus);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
|binary
writerfilter/source/rtftok/rtfdocumentimpl.cxx
|4
2 files changed, 4 insertions(+)
New commits:
commit e2b9531e43d37677109aa13eb6e2ebf857961016
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 17 22:32:52 2014 +0100
check for empty m_aStates
valgrind + bff
Change-Id: Ib818d508e10877a845b733c4aa223d1e2cbbc05e
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
new file mode 100644
index 000..0925203
Binary files /dev/null and
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7098f04..3cbc638 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -459,6 +459,10 @@ void RTFDocumentImpl::checkNeedPap()
if (m_bNeedPap)
{
m_bNeedPap = false; // reset early, so we can avoid recursion when
calling ourselves
+
+if (m_aStates.empty())
+return;
+
if (!m_aStates.top().pCurrentBuffer)
{
writerfilter::ReferenceProperties::Pointer_t const
pParagraphProperties(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source include/sfx2 include/svx sfx2/source unusedcode.easy
extensions/source/dbpilots/controlwizard.cxx | 25 ---
extensions/source/dbpilots/controlwizard.hxx |2 -
extensions/source/dbpilots/gridwizard.hxx |5 ---
extensions/source/dbpilots/groupboxwiz.hxx |6 +++-
extensions/source/dbpilots/listcombowizard.hxx |8 +++---
include/sfx2/tabdlg.hxx|1
include/svx/dlgctrl.hxx|4 ---
sfx2/source/dialog/tabdlg.cxx | 32 -
unusedcode.easy|2 +
9 files changed, 10 insertions(+), 75 deletions(-)
New commits:
commit b5a0b00d494928482e4dd44395765c480c8ae252
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 18 08:26:48 2014 +0100
callcatcher: another round of resource ctor removals
Change-Id: Ic554fa7c1e549a0f39296836868b22ccf4c859d3
diff --git a/extensions/source/dbpilots/controlwizard.cxx
b/extensions/source/dbpilots/controlwizard.cxx
index a60491a..d51aef5 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -46,11 +46,8 @@
#include tools/urlobj.hxx
#include vcl/layout.hxx
-
namespace dbp
{
-
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
@@ -68,9 +65,6 @@ namespace dbp
using namespace ::comphelper;
using namespace ::dbtools;
-
-//= OAccessRegulator
-
struct OAccessRegulator
{
friend class OControlWizardPage;
@@ -79,22 +73,6 @@ namespace dbp
OAccessRegulator() { }
};
-
-//= OControlWizardPage
-
-
-OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const
ResId _rResId )
-:OControlWizardPage_Base( _pParent, _rResId )
-,m_pFormDatasourceLabel(NULL)
-,m_pFormDatasource(NULL)
-,m_pFormContentTypeLabel(NULL)
-,m_pFormContentType(NULL)
-,m_pFormTableLabel(NULL)
-,m_pFormTable(NULL)
-{
-}
-
-
OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const
OString rID, const OUString rUIXMLDescription )
:OControlWizardPage_Base( _pParent, rID, rUIXMLDescription )
,m_pFormDatasourceLabel(NULL)
@@ -106,18 +84,15 @@ namespace dbp
{
}
-
OControlWizardPage::~OControlWizardPage()
{
}
-
OControlWizard* OControlWizardPage::getDialog()
{
return static_cast OControlWizard* (GetParent());
}
-
const OControlWizard* OControlWizardPage::getDialog() const
{
return static_cast OControlWizard* (GetParent());
diff --git a/extensions/source/dbpilots/controlwizard.hxx
b/extensions/source/dbpilots/controlwizard.hxx
index 725c0b3..6df51b8 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -72,9 +72,7 @@ namespace dbp
voidsetFormConnection(const
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XConnection
_rxConn, bool _bAutoDispose = true );
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XConnection
getFormConnection() const;
-
public:
-OControlWizardPage( OControlWizard* _pParent, const ResId _rResId );
OControlWizardPage( OControlWizard* _pParent, const OString rID,
const OUString rUIXMLDescription );
virtual ~OControlWizardPage();
diff --git a/extensions/source/dbpilots/gridwizard.hxx
b/extensions/source/dbpilots/gridwizard.hxx
index e65e75d..d3aac82 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -68,22 +68,17 @@ namespace dbp
void implApplySettings();
};
-
//= OGridPage
-
class OGridPage : public OControlWizardPage
{
public:
-OGridPage( OGridWizard* _pParent, const ResId _rId ) :
OControlWizardPage(_pParent, _rId) { }
OGridPage( OGridWizard* _pParent, const OString _rID, const OUString
_rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) {
}
protected:
OGridSettings getSettings() { return
static_castOGridWizard*(getDialog())-getSettings(); }
};
-
//= OGridFieldsSelection
-
class OGridFieldsSelection : public OGridPage
{
protected:
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx
b/extensions/source/dbpilots/groupboxwiz.hxx
index 28bf05b..a2e1c3e 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -79,8 +79,10 @@ namespace dbp
class OGBWPage : public OControlWizardPage
{
public:
-OGBWPage( OControlWizard* _pParent, const ResId _rId ) :
OControlWizardPage(_pParent, _rId) { }
-OGBWPage( OControlWizard* _pParent, const OString _rID, const
OUString _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID,
_rUIXMLDescription) {
[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/source svx/source sw/source
cui/source/tabpages/tpshadow.cxx | 20
filter/source/msfilter/msdffimp.cxx | 12 -
include/svx/sdsxyitm.hxx | 22 --
sc/source/core/data/drwlayer.cxx |4 +--
sc/source/core/data/postit.cxx|8 +++---
sc/source/core/tool/detfunc.cxx |4 +--
sc/source/filter/excel/xiescher.cxx |4 +--
sd/source/core/drawdoc4.cxx | 16 ++---
sd/source/core/stlpool.cxx|4 +--
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx |4 +--
svx/source/sdr/primitive2d/sdrattributecreator.cxx|4 +--
svx/source/svdraw/svdattr.cxx |4 +--
svx/source/svdraw/svdoashp.cxx|8 +++---
sw/source/core/attr/swatrset.cxx |4 +--
sw/source/core/doc/DocumentDrawModelManager.cxx |4 +--
sw/source/filter/ww8/ww8graf.cxx |8 +++---
16 files changed, 60 insertions(+), 70 deletions(-)
New commits:
commit a51c423743835793bf132c925ad962283fd2dc22
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 18 10:55:03 2014 +0200
Consistency around SdrMetricItem in svx/sdsxyitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: I3734cb14b6ed8f556af85b234968682a55ac8a4c
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 13dc142..0a56580 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -296,23 +296,23 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
if( rOutAttrs.GetItemState( SDRATTR_SHADOWXDIST ) !=
SFX_ITEM_DONTCARE
rOutAttrs.GetItemState( SDRATTR_SHADOWYDIST ) !=
SFX_ITEM_DONTCARE )
{
-nOldX = ( ( const SdrShadowXDistItem ) rOutAttrs.
+nOldX = ( ( const SdrMetricItem ) rOutAttrs.
Get( SDRATTR_SHADOWXDIST ) ).GetValue();
-nOldY = ( ( const SdrShadowYDistItem ) rOutAttrs.
+nOldY = ( ( const SdrMetricItem ) rOutAttrs.
Get( SDRATTR_SHADOWYDIST ) ).GetValue();
}
-SdrShadowXDistItem aXItem( nX );
+SdrMetricItem aXItem( makeSdrShadowXDistItem(nX) );
pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWXDIST );
if ( nX != nOldX
-( !pOld || !( *(const SdrShadowXDistItem*)pOld == aXItem ) ) )
+( !pOld || !( *(const SdrMetricItem*)pOld == aXItem ) ) )
{
rAttrs-Put( aXItem );
bModified = true;
}
-SdrShadowYDistItem aYItem( nY );
+SdrMetricItem aYItem( makeSdrShadowYDistItem(nY) );
pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWYDIST );
if ( nY != nOldY
-( !pOld || !( *(const SdrShadowYDistItem*)pOld == aYItem ) ) )
+( !pOld || !( *(const SdrMetricItem*)pOld == aYItem ) ) )
{
rAttrs-Put( aYItem );
bModified = true;
@@ -382,8 +382,8 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
if( rAttrs-GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE
rAttrs-GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE )
{
-sal_Int32 nX = ( ( const SdrShadowXDistItem ) rAttrs-Get(
SDRATTR_SHADOWXDIST ) ).GetValue();
-sal_Int32 nY = ( ( const SdrShadowYDistItem ) rAttrs-Get(
SDRATTR_SHADOWYDIST ) ).GetValue();
+sal_Int32 nX = ( ( const SdrMetricItem ) rAttrs-Get(
SDRATTR_SHADOWXDIST ) ).GetValue();
+sal_Int32 nY = ( ( const SdrMetricItem ) rAttrs-Get(
SDRATTR_SHADOWYDIST ) ).GetValue();
if( nX != 0 )
SetMetricValue( *m_pMtrDistance, nX 0L ? -nX : nX, ePoolUnit
);
@@ -406,8 +406,8 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
{
// determine default-distance
SfxItemPool* pPool = rOutAttrs.GetPool();
-SdrShadowXDistItem* pXDistItem =
(SdrShadowXDistItem*)pPool-GetDefaultItem (SDRATTR_SHADOWXDIST);
-SdrShadowYDistItem* pYDistItem =
(SdrShadowYDistItem*)pPool-GetDefaultItem (SDRATTR_SHADOWYDIST);
+SdrMetricItem* pXDistItem = (SdrMetricItem*)pPool-GetDefaultItem
(SDRATTR_SHADOWXDIST);
+SdrMetricItem* pYDistItem = (SdrMetricItem*)pPool-GetDefaultItem
(SDRATTR_SHADOWYDIST);
if (pXDistItem pYDistItem)
{
sal_Int32 nX = pXDistItem-GetValue();
diff --git a/filter/source/msfilter/msdffimp.cxx
[Bug 82577] get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 --- Comment #4 from Björn Michaelsen bjoern.michael...@canonical.com --- (In reply to comment #3) One thing that we need consensus on is whether to use a real C++ namespace or a C-style one, i.e. just prefixing the conlicting LibreOffice type names with some short string, like Vcl. IHMO C++ namespaces as its better for tooling, e.g. doxygen: http://docs.libreoffice.org/sw/html/namespaces.html I guess the C++ namespace would be better from a C++ orthodoxy point of view, but what should the namespace be? vcl:: ? org::libreoffice::vcl:: (brrr)? No, not a java-like lets prefix my full home address thing. We already have com::sun::star:: as our public API. There were discussions of aliasing that as libreoffice:: (llunak wanted something like that IIRC). For our private/internal API, having vcl::Foo should already be less risky than VclFoo -- and in the long term, if needed, we could move vcl:: to something-like libreoffice::private::vcl:: or libreoffice::internal::vcl::, when there are conflicts. It will be a lot easier to move a namespace than to rename hundreds of classes. In any case, we *don't* want to repeat the current disaster of inconsistent using declaration, varying from one source file to another. IMHO that is mostly a symptom of having unmanageable 10KLOC or more per source file, so that its not easy to see what a using (or #include for the matter) is for and thus they are rarely touched and just grow. Would using a C++ namespace have the benefit that it would be enough to just add a using namespace vcl (or whatever) in some header, and only those few source files that actually refer to the identically-named X11 types would need to add a :: prefix to those? using in header files is so harmful that most coding styles disencourage it, e.g. Sutter/Alexandrescus C++ Coding Standards rule 59: Don’t write namespace usings in a header file or before an #include. http://stackoverflow.com/questions/5849457/using-namespace-in-c-headers Anyway, this is more of a discussion for the mailing list or the ESC, lets take it there if there is further need. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82577] get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 --- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com --- Oh, one more thing: Making everything C++ mangled names (or other long prefixes) might have an impact on dynamic linking and thus startup time. mmeeks would have some words about that, Im sure. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source framework/inc framework/source
desktop/source/app/dispatchwatcher.hxx|2 +-
framework/inc/classes/filtercachedata.hxx |4 ++--
framework/inc/stdtypes.h |4 ++--
framework/inc/uifactory/configurationaccessfactorymanager.hxx |2 +-
framework/inc/uifactory/factoryconfiguration.hxx |2 +-
framework/inc/xml/imagesdocumenthandler.hxx |2 +-
framework/inc/xml/statusbardocumenthandler.hxx|2 +-
framework/inc/xml/toolboxdocumenthandler.hxx |2 +-
framework/source/uielement/controlmenucontroller.cxx |2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 3b6091ca42cd2d9f230e7d81648c34f3d7085107
Author: Noel Grandin n...@peralex.com
Date: Fri Aug 15 15:30:09 2014 +0200
document the swap-on-free idiom usage
Effective C++, item 17
Change-Id: I5c6f20c9631f1ca86b481a56ef08d578a7addbad
diff --git a/desktop/source/app/dispatchwatcher.hxx
b/desktop/source/app/dispatchwatcher.hxx
index 125e9d9..228b6a1 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -44,7 +44,7 @@ class DispatchWatcherHashMap : public ::boost::unordered_map
OUString, sal_Int3
public:
inline void free()
{
-DispatchWatcherHashMap().swap( *this );
+DispatchWatcherHashMap().swap( *this ); // get rid of reserved
capacity
}
};
diff --git a/framework/inc/classes/filtercachedata.hxx
b/framework/inc/classes/filtercachedata.hxx
index 499e48f..af9053a 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -337,7 +337,7 @@ class SetNodeHash : public ::boost::unordered_map OUString
,
inline void free()
{
-SetNodeHash().swap( *this );
+SetNodeHash().swap( *this ); // get rid of reserved capacity
lAddedItems.free ();
lChangedItems.free();
lRemovedItems.free();
@@ -372,7 +372,7 @@ class PerformanceHash : public ::boost::unordered_map
OUString
inline void free()
{
-PerformanceHash().swap( *this );
+PerformanceHash().swap( *this ); // get rid of reserved capacity
}
// normaly a complete string must match our hash key values ...
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index d814a57..3ff9e0d 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -108,7 +108,7 @@ class OUStringList : public ::comphelper::SequenceAsVector
OUString
// the only way to free used memory really!
void free()
{
-OUStringList().swap( *this );
+OUStringList().swap( *this );// get rid of reserved capacity
}
};
@@ -135,7 +135,7 @@ class BaseHash : public ::boost::unordered_map OUString
,
// the only way to free used memory really!
void free()
{
-BaseHash().swap( *this );
+BaseHash().swap( *this );// get rid of reserved capacity
}
};
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index 5d6ad0a..b4f9afe 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -63,7 +63,7 @@ namespace framework {
{
inline void free()
{
-FactoryManagerMap().swap( *this );
+FactoryManagerMap().swap( *this );// get rid of reserved
capacity
}
};
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx
b/framework/inc/uifactory/factoryconfiguration.hxx
index 8360f8b..2df76a2 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -80,7 +80,7 @@ private:
{
inline void free()
{
-MenuControllerMap().swap( *this );
+MenuControllerMap().swap( *this );// get rid of reserved capacity
}
};
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx
b/framework/inc/xml/imagesdocumenthandler.hxx
index 7659d39..b984ced 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -116,7 +116,7 @@ class OReadImagesDocumentHandler : public
::cppu::WeakImplHelper1 ::com::sun::s
public:
inline void free()
{
-ImageHashMap().swap( *this );
+ImageHashMap().swap( *this );// get rid of reserved
capacity
}
};
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx
b/framework/inc/xml/statusbardocumenthandler.hxx
index 88c094e..8242874 100644
---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/ww8import/data/bnc787942.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |7 +++
sw/source/filter/ww8/ww8par.hxx |2 ++
sw/source/filter/ww8/ww8par6.cxx | 14 +-
4 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 5a454e5ed3f16da01b27529b4355e60ce4c817b6
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Sun Aug 17 18:12:16 2014 +0200
fix reading a .doc that has frame anchored to the end of page (bnc#787942)
MSWord, unlike Writer, can anchor even to a page break (i.e. after the last
paragraph). When this document was read, what happended was:
- the last paragraph was read and the current position PaM was set to point
after it
- frame was read and anchored to the PaM
- page break was read, making everything following be moved to the next
page;
including whatever ended up at the PaM position
Handle this by checking for this case and inserting an extra empty paragraph
before the break. This shouldn't affect layout of the page itself anyway,
since the break should leave room for it (and MSWord shows a page break
there if control characters are enabled, so there is room).
Change-Id: Ia2a13bf5cf1c959b5aa228254365019a00a22679
(cherry picked from commit 4a1888a97eab4ead2e0bec76cd1cba410a8e7e13)
Reviewed-on: https://gerrit.libreoffice.org/10952
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
diff --git a/sw/qa/extras/ww8import/data/bnc787942.doc
b/sw/qa/extras/ww8import/data/bnc787942.doc
new file mode 100644
index 000..06b2c39
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc787942.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 6a48abf..1e99ab8 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -336,6 +336,13 @@ DECLARE_WW8IMPORT_TEST(testFdp80333, fdo80333.doc)
#endif
+DECLARE_WW8IMPORT_TEST(testBnc787942, bnc787942.doc)
+{
+// The frame ended up on the second page instead of first.
+parseDump(/root/page[1]/body/txt[4]/anchored);
+}
+
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 9434c2e..696d103 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1351,6 +1351,8 @@ private:
// a document position recorded the after-position of TOC section, managed
by Read_F_TOX() and End_Field()
SwPaM* mpPosAfterTOC;
+boost::scoped_ptr SwPosition lastAnchorPos;
+
bool mbCareFirstParaEndInToc;
bool mbCareLastParaEndInToc;
cp_set maTOXEndCps;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 0324552..14cb5b3 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -800,6 +800,18 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool
/*bMustHaveBreak*/)
if (!pSep)
return;
+if (!maSegments.empty() mrReader.lastAnchorPos.get()
*mrReader.lastAnchorPos == *mrReader.pPaM-GetPoint())
+{
+bool insert = true;
+SwPaM pam( *mrReader.lastAnchorPos );
+if( pam.Move(fnMoveBackward, fnGoNode))
+if( SwTxtNode* txtNode =
pam.GetPoint()-nNode.GetNode().GetTxtNode())
+if( txtNode-Len() == 0 )
+insert = false;
+if( insert )
+mrReader.AppendTxtNode(*mrReader.pPaM-GetPoint());
+}
+
ww::WordVersion eVer = mrReader.GetFib().GetFIBVersion();
// M.M. Create a linked section if the WkbPLCF
@@ -1739,7 +1751,6 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM rPaM,
const sal_Int32 nIniFlyDx,
const sal_Int32 nIniFlyDy )
{
-(void) rPaM;
(void) nPgLeft;
memset( this, 0, sizeof( WW8SwFlyPara ) ); // Initialisieren
@@ -1807,6 +1818,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM rPaM,
//#i53725# - absolute positioned objects have to be
// anchored at-paragraph to assure its correct anchor position.
eAnchor = FLY_AT_PARA;
+rIo.lastAnchorPos.reset( new SwPosition(*rPaM.GetPoint()));
switch (nYBind)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa sw/source
sw/qa/extras/ww8import/data/bnc787942.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |6 ++
sw/source/filter/ww8/ww8par.hxx |2 ++
sw/source/filter/ww8/ww8par6.cxx | 14 +-
4 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 8d7354156aa4fe672766d5dba364037b66cb3435
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Sun Aug 17 18:12:16 2014 +0200
fix reading a .doc that has frame anchored to the end of page (bnc#787942)
MSWord, unlike Writer, can anchor even to a page break (i.e. after the last
paragraph). When this document was read, what happended was:
- the last paragraph was read and the current position PaM was set to point
after it
- frame was read and anchored to the PaM
- page break was read, making everything following be moved to the next
page;
including whatever ended up at the PaM position
Handle this by checking for this case and inserting an extra empty paragraph
before the break. This shouldn't affect layout of the page itself anyway,
since the break should leave room for it (and MSWord shows a page break
there if control characters are enabled, so there is room).
(cherry picked from commit 4a1888a97eab4ead2e0bec76cd1cba410a8e7e13)
Conflicts:
sw/qa/extras/ww8import/ww8import.cxx
Change-Id: Ia2a13bf5cf1c959b5aa228254365019a00a22679
Reviewed-on: https://gerrit.libreoffice.org/10951
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
diff --git a/sw/qa/extras/ww8import/data/bnc787942.doc
b/sw/qa/extras/ww8import/data/bnc787942.doc
new file mode 100644
index 000..06b2c39
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc787942.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 33e0cfb..81b0043 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -490,6 +490,12 @@ DECLARE_WW8IMPORT_TEST(testFloatingTableSectionColumns,
floating-table-section-
CPPUNIT_ASSERT( tableWidth.toInt32() 1 );
}
+DECLARE_WW8IMPORT_TEST(testBnc787942, bnc787942.doc)
+{
+// The frame ended up on the second page instead of first.
+parseDump(/root/page[1]/body/txt[4]/anchored);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 99b5de2..0acfdb8 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1345,6 +1345,8 @@ private:
// a document position recorded the after-position of TOC section, managed
by Read_F_TOX() and End_Field()
SwPaM* mpPosAfterTOC;
+boost::scoped_ptr SwPosition lastAnchorPos;
+
bool mbCareFirstParaEndInToc;
bool mbCareLastParaEndInToc;
cp_set maTOXEndCps;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 6942f88..5e7ce09 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -794,6 +794,18 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool
/*bMustHaveBreak*/)
if (!pSep)
return;
+if (!maSegments.empty() mrReader.lastAnchorPos.get()
*mrReader.lastAnchorPos == *mrReader.pPaM-GetPoint())
+{
+bool insert = true;
+SwPaM pam( *mrReader.lastAnchorPos );
+if( pam.Move(fnMoveBackward, fnGoNode))
+if( SwTxtNode* txtNode =
pam.GetPoint()-nNode.GetNode().GetTxtNode())
+if( txtNode-Len() == 0 )
+insert = false;
+if( insert )
+mrReader.AppendTxtNode(*mrReader.pPaM-GetPoint());
+}
+
ww::WordVersion eVer = mrReader.GetFib().GetFIBVersion();
// M.M. Create a linked section if the WkbPLCF
@@ -1735,7 +1747,6 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM rPaM,
const sal_Int32 nIniFlyDx,
const sal_Int32 nIniFlyDy )
{
-(void) rPaM;
(void) nPgLeft;
memset( this, 0, sizeof( WW8SwFlyPara ) ); // Initialisieren
@@ -1803,6 +1814,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM rPaM,
//#i53725# - absolute positioned objects have to be
// anchored at-paragraph to assure its correct anchor position.
eAnchor = FLY_AT_PARA;
+rIo.lastAnchorPos.reset( new SwPosition(*rPaM.GetPoint()));
switch (nYBind)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/jmux/mailmerge-fixes-review' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source cui/source dbaccess/source desktop/source extensions/source filter/source fpicker/source scripting/source sc/source sd/source sfx2/source sot/source svx/s
basctl/source/basicide/baside2.cxx |8 +-- basctl/source/basicide/baside3.cxx |3 - basctl/source/basicide/basobj2.cxx |8 +-- basctl/source/basicide/basobj3.cxx |6 +- basctl/source/basicide/bastypes.cxx|8 +-- basctl/source/basicide/macrodlg.cxx|8 +-- basctl/source/basicide/moduldlg.cxx| 10 +--- cui/source/dialogs/SpellDialog.cxx |6 +- cui/source/dialogs/about.cxx |4 - cui/source/dialogs/insdlg.cxx |9 +-- cui/source/dialogs/passwdomdlg.cxx |7 +- cui/source/dialogs/scriptdlg.cxx | 14 ++--- cui/source/options/doclinkdialog.cxx |8 +-- cui/source/options/optjava.cxx |5 -- cui/source/tabpages/tparea.cxx |4 - dbaccess/source/ui/app/AppControllerDnD.cxx|4 - dbaccess/source/ui/dlg/TextConnectionHelper.cxx|4 - dbaccess/source/ui/dlg/UserAdmin.cxx |4 - dbaccess/source/ui/dlg/adminpages.cxx |4 - dbaccess/source/ui/dlg/directsql.cxx |4 - dbaccess/source/ui/dlg/indexdialog.cxx |6 +- dbaccess/source/ui/dlg/paramdialog.cxx |4 - desktop/source/deployment/gui/dp_gui_dialog2.cxx |3 - desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |9 ++- desktop/source/deployment/gui/dp_gui_service.cxx |8 +-- extensions/source/scanner/sanedlg.cxx | 13 ++--- filter/source/xsltdialog/xmlfiltertabdialog.cxx|4 - fpicker/source/office/iodlg.cxx|8 +-- sc/source/core/data/documen8.cxx |2 sc/source/core/data/validat.cxx|7 +- sc/source/ui/dbgui/dbnamdlg.cxx|2 sc/source/ui/dbgui/filtdlg.cxx |5 -- sc/source/ui/dbgui/sfiltdlg.cxx|3 - sc/source/ui/dbgui/tpsort.cxx |4 - sc/source/ui/docshell/documentlinkmgr.cxx |4 - sc/source/ui/miscdlgs/crnrdlg.cxx |2 sc/source/ui/miscdlgs/filldlg.cxx |5 -- sc/source/ui/miscdlgs/instbdlg.cxx |2 sc/source/ui/miscdlgs/optsolver.cxx|2 sc/source/ui/miscdlgs/scuiautofmt.cxx | 14 +++-- sc/source/ui/miscdlgs/solvrdlg.cxx |2 sc/source/ui/optdlg/tpcalc.cxx |3 - sc/source/ui/optdlg/tpusrlst.cxx |2 sc/source/ui/pagedlg/areasdlg.cxx |3 - sc/source/ui/view/cellsh3.cxx |6 +- sc/source/ui/view/dbfunc.cxx |4 - sc/source/ui/view/tabvwshf.cxx |3 - scripting/source/dlgprov/dlgevtatt.cxx |4 - sd/source/core/drawdoc3.cxx|3 - sd/source/filter/grf/sdgrffilter.cxx |4 - sd/source/filter/html/pubdlg.cxx |4 - sd/source/ui/app/sdmod1.cxx|2 sd/source/ui/dlg/brkdlg.cxx|2 sd/source/ui/dlg/sdtreelb.cxx |4 - sd/source/ui/func/fuinsert.cxx |2 sd/source/ui/func/fuinsfil.cxx |8 +-- sd/source/ui/func/futhes.cxx |6 +- sd/source/ui/view/Outliner.cxx |3 - sfx2/source/appl/lnkbase2.cxx |4 - sfx2/source/appl/sfxhelp.cxx |9 +-- sfx2/source/doc/objserv.cxx| 10 ++-- sfx2/source/doc/templatedlg.cxx| 32 ++--- sfx2/source/view/viewprn.cxx | 10 ++-- sot/source/sdstor/stgcache.cxx | 28 --- svx/source/dialog/passwd.cxx |7 +- svx/source/form/fmshimp.cxx|7 +- uui/source/masterpasscrtdlg.cxx|8 --- uui/source/masterpassworddlg.cxx |4 - uui/source/nameclashdlg.cxx|4 - uui/source/passworddlg.cxx |6 +- vcl/android/androidinst.cxx|6 +- vcl/ios/iosinst.cxx
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 53 +--
sw/source/filter/ww8/ww8par.hxx |2 -
sw/source/filter/ww8/ww8par6.cxx |6 +--
4 files changed, 60 insertions(+), 7 deletions(-)
New commits:
commit be515af4d9e86c8bc13a47413676bda80cee6a3e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 18 11:20:20 2014 +0200
DOCX filter: improve qFormat export handling
The old rule was: write qFormat for everything that's not a custom
style.
The new rule: write qFormat for everything that's a custom style + have
a whitelist of non-custom, but qFormat styles.
This matches better what Word does (whitelist is from the latent style
section of an empty document, created by Word).
Change-Id: Ie7a0802e886c41b8d26ca9aa154913aa2f3ff87a
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2d47c8c..593358e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1191,6 +1191,12 @@ DECLARE_OOXMLEXPORT_TEST(testCharacterBorder,
charborder.odt)
CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT,
aShadow.Location);
CPPUNIT_ASSERT_EQUAL(sal_Int16(318), aShadow.ShadowWidth);
}
+
+if (xmlDocPtr pXmlStyles = parseExport(word/styles.xml))
+{
+// Make sure we write qFormat for custom style names.
+assertXPath(pXmlStyles, //w:style[@w:styleId='Heading']/w:qFormat,
1);
+}
}
DECLARE_OOXMLEXPORT_TEST(testStyleInheritance, style-inheritance.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f8f2d00..4ead526 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5054,6 +5054,55 @@ oox::drawingml::DrawingML
DocxAttributeOutput::GetDrawingML()
return m_rDrawingML;
}
+/// Functor to do case-insensitive ordering of OUString instances.
+struct OUStringIgnoreCase
+{
+bool operator() (const OUString lhs, const OUString rhs) const
+{
+return lhs.compareToIgnoreAsciiCase(rhs) 0;
+}
+};
+
+/// Guesses if a style created in Writer (no grab-bag) should be qFormat or
not.
+static bool lcl_guessQFormat(const OUString rName, sal_uInt16 nWwId)
+{
+// If the style has no dedicated STI number, then it's probably a custom
style - qFormat.
+if (nWwId == ww::stiUser)
+return true;
+
+static std::setOUString, OUStringIgnoreCase aWhitelist;
+if (aWhitelist.empty())
+{
+aWhitelist.insert(Normal);
+aWhitelist.insert(Heading 1);
+aWhitelist.insert(Heading 2);
+aWhitelist.insert(Heading 3);
+aWhitelist.insert(Heading 4);
+aWhitelist.insert(Heading 5);
+aWhitelist.insert(Heading 6);
+aWhitelist.insert(Heading 7);
+aWhitelist.insert(Heading 8);
+aWhitelist.insert(Heading 9);
+aWhitelist.insert(Caption);
+aWhitelist.insert(Title);
+aWhitelist.insert(Subtitle);
+aWhitelist.insert(Strong);
+aWhitelist.insert(Emphasis);
+aWhitelist.insert(No Spacing);
+aWhitelist.insert(List Paragraph);
+aWhitelist.insert(Quote);
+aWhitelist.insert(Intense Quote);
+aWhitelist.insert(Subtle Emphasis,);
+aWhitelist.insert(Intense Emphasis);
+aWhitelist.insert(Subtle Reference);
+aWhitelist.insert(Intense Reference);
+aWhitelist.insert(Book Title);
+aWhitelist.insert(TOC Heading);
+}
+// Not custom style? Then we have a list of standard styles which should
be qFormat.
+return aWhitelist.find(rName) != aWhitelist.end();
+}
+
void DocxAttributeOutput::StartStyle( const OUString rName, StyleType eType,
sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId,
bool bAutoUpdate )
{
@@ -5148,9 +5197,7 @@ void DocxAttributeOutput::StartStyle( const OUString
rName, StyleType eType,
if (bUnhideWhenUsed)
m_pSerializer-singleElementNS(XML_w, XML_unhideWhenUsed, FSEND);
-// If the style has a dedicated STI number, then chances are high that Word
-// will have qFormat enabled for it, so let's do the same.
-if (bQFormat || nWwId != ww::stiUser)
+if (bQFormat || lcl_guessQFormat(rName, nWwId))
m_pSerializer-singleElementNS(XML_w, XML_qFormat, FSEND);
if (bLocked)
m_pSerializer-singleElementNS(XML_w, XML_locked, FSEND);
commit f1095b41c6506b153199a72b36fc720804ea9ebc
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 18 10:37:25 2014 +0200
Fix missing prefix
Change-Id: I0a9df00f90b63059e6446278d7a98d1cd902de4b
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 0f50969..d44e508 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 90e3e9c3c8154be276beffed6adcb18c383cfb53 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Mon Jun 9 17:31:49 2014 +0200 .gitignore /.gdb_history Change-Id: I254c0104010cc1a1c12bbf1af048966de66924e6 Reviewed-on: https://gerrit.libreoffice.org/10973 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/.gitignore b/.gitignore index 2a53bbc..a273e0b 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ xcuserdata # gdb config /.gdbinit +/.gdb_history ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libgltf
external/libgltf/pathces/append_shader_version.patch | 31 +++
1 file changed, 19 insertions(+), 12 deletions(-)
New commits:
commit a501f64beb4e37330764a2f5c091685f2ca9359f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 18 09:24:23 2014 +0200
libgltf: check for #version string in the shader before add an own one.
Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf
(cherry picked from commit 6be202585f201deaf07c57e0f2cf722cce91165e)
Reviewed-on: https://gerrit.libreoffice.org/10957
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/external/libgltf/pathces/append_shader_version.patch
b/external/libgltf/pathces/append_shader_version.patch
index dd79515..27f0cc6 100644
--- a/external/libgltf/pathces/append_shader_version.patch
+++ b/external/libgltf/pathces/append_shader_version.patch
@@ -1,6 +1,6 @@
diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
libgltf.org/src/Shaders.cpp2014-08-17 09:15:17.379255115 +0200
-+++ libgltf/src/Shaders.cpp2014-08-17 09:16:43.323258781 +0200
+--- libgltf.org/src/Shaders.cpp2014-08-18 09:19:48.323955939 +0200
libgltf/src/Shaders.cpp2014-08-18 09:20:46.711953465 +0200
@@ -11,6 +11,7 @@
#include GL/glew.h
@@ -9,22 +9,29 @@ diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
namespace libgltf
{
-@@ -166,7 +167,17 @@
+@@ -166,7 +167,24 @@
unsigned int shaderId)
{
GLint iGLSize = iSize;
-glShaderSource(shaderId, 1, pShader, iGLSize);
-+const GLchar* aSources[] = {
-+#version 130\n,
-+pShader,
-+};
++if( strstr(pShader,#version) == 0 )
++{
++const GLchar* aSources[] = {
++#version 130\n,
++pShader,
++};
+
-+const GLint aSizes[] = {
-+strlen(#version 130\n),
-+iGLSize,
-+};
++const GLint aSizes[] = {
++strlen(#version 130\n),
++iGLSize,
++};
+
-+glShaderSource(shaderId, 2, aSources[0], aSizes[0]);
++glShaderSource(shaderId, 2, aSources[0], aSizes[0]);
++}
++else
++{
++glShaderSource(shaderId, 1, pShader, iGLSize);
++}
glCompileShader(shaderId);
int iStatus = 0;
glGetShaderiv(shaderId, GL_COMPILE_STATUS, iStatus);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/AllLangResTarget_scn.mk extensions/Module_extensions.mk extensions/source scp2/source
extensions/AllLangResTarget_scn.mk | 31
extensions/Module_extensions.mk |1
extensions/source/scanner/sanedlg.cxx| 19 +
extensions/source/scanner/strings.hrc| 17 +++
extensions/source/scanner/strings.src| 34 +++
scp2/source/ooo/file_resource_ooo.scp|6 +
scp2/source/ooo/module_lang_template.scp |1
7 files changed, 105 insertions(+), 4 deletions(-)
New commits:
commit 1bb161ece5bd3a868778b7a8d4528bedaa589710
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 18 11:10:25 2014 +0100
these strings should be translatable
so bring back scn.res and add them in there
Change-Id: I378d64f524c64295d26223f54fe17950b475cd80
diff --git a/extensions/AllLangResTarget_scn.mk
b/extensions/AllLangResTarget_scn.mk
new file mode 100644
index 000..be69430
--- /dev/null
+++ b/extensions/AllLangResTarget_scn.mk
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,scn))
+
+$(eval $(call
gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner))
+
+$(eval $(call gb_AllLangResTarget_add_srs,scn,\
+ scn/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,scn/res))
+
+$(eval $(call gb_SrsTarget_set_include,scn/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/extensions/source/scanner \
+))
+
+$(eval $(call gb_SrsTarget_add_files,scn/res,\
+ extensions/source/scanner/strings.src \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index f62ba8d..de1fa1b 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
$(eval $(call gb_Module_add_l10n_targets,extensions,\
AllLangResTarget_abp \
+ AllLangResTarget_scn \
AllLangResTarget_upd \
UIConfig_sabpilot \
UIConfig_scanner \
diff --git a/extensions/source/scanner/sanedlg.cxx
b/extensions/source/scanner/sanedlg.cxx
index 9a8c3b5..c47e1a6 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -28,6 +28,7 @@
#include sal/macros.h
#include rtl/strbuf.hxx
#include boost/scoped_array.hpp
+#include strings.hrc
#define PREVIEW_WIDTH 113
#define PREVIEW_HEIGHT 160
@@ -241,11 +242,21 @@ SaneDlg::~SaneDlg()
mrSane.SetReloadOptionsHdl( maOldLink );
}
+namespace {
+
+ResId SaneResId( sal_uInt32 nID )
+{
+static ResMgr* pResMgr = ResMgr::CreateResMgr( scn );
+return ResId( nID, *pResMgr );
+}
+
+}
+
short SaneDlg::Execute()
{
if( ! Sane::IsSane() )
{
-MessageDialog aErrorBox(NULL, The SANE interface could not be
initialized. Scanning is not possible.);
+MessageDialog aErrorBox(NULL, SaneResId(STR_COULD_NOT_BE_INIT));
aErrorBox.Execute();
return sal_False;
}
@@ -523,7 +534,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
{
if( pButton == mpDeviceInfoButton )
{
-OUString aString(Device: %s\nVendor: %s\nModel: %s\nType: %s);
+OUString aString(SaneResId(STR_DEVICE_DESC));
aString = aString.replaceFirst( %s, Sane::GetName(
mrSane.GetDeviceNumber() ) );
aString = aString.replaceFirst( %s, Sane::GetVendor(
mrSane.GetDeviceNumber() ) );
aString = aString.replaceFirst( %s, Sane::GetModel(
mrSane.GetDeviceNumber() ) );
@@ -808,7 +819,7 @@ void SaneDlg::AcquirePreview()
int nOption = mrSane.GetOptionByName( preview );
if( nOption == -1 )
{
-OUString aString(The device does not offer a preview option.
Therefore, a normal scan will be used as a preview instead. This may take a
considerable amount of time. );
+OUString aString(SaneResId(STR_SLOW_PREVIEW));
MessageDialog aBox(this, aString, VCL_MESSAGE_WARNING,
VCL_BUTTONS_OK_CANCEL);
if (aBox.Execute() == RET_CANCEL)
return;
@@ -819,7 +830,7 @@ void SaneDlg::AcquirePreview()
BitmapTransporter aTransporter;
if( ! mrSane.Start( aTransporter ) )
{
-MessageDialog aErrorBox(this, An error occurred while scanning.);
+MessageDialog aErrorBox(this, SaneResId(STR_ERROR_SCAN));
aErrorBox.Execute();
}
else
diff --git a/extensions/source/scanner/strings.hrc
b/extensions/source/scanner/strings.hrc
new file mode 100644
index 000..209acdc
--- /dev/null
+++ b/extensions/source/scanner/strings.hrc
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/dbggui.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 0e3a462c641a3a7a3b0d991463f9b05683c7ec5d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 18 11:20:44 2014 +0100
missing InfoBox
Change-Id: I67e6e60e5a03696ec27b11afaa62ea443c5924ce
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 9099258..fd65cab 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -349,10 +349,9 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
}
if( (aData.nTestFlags ~IMMEDIATE_FLAGS) != (pData-nTestFlags
~IMMEDIATE_FLAGS) )
{
-InfoBox aBox( this, OUString(
+MessageDialog aBox(this, OUString(
Some of the changed settings will only be active after
-restarting the process
-) );
+restarting the process), VCL_MESSAGE_INFO);
aBox.Execute();
}
EndDialog( RET_OK );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gcc-wrappers
solenv/gcc-wrappers/g++.cxx |2 +-
solenv/gcc-wrappers/gcc.cxx |2 +-
solenv/gcc-wrappers/wrapper.cxx |5 -
solenv/gcc-wrappers/wrapper.hxx |2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit a18ff3d5c75c2b468c48bd19439dee0689d24d67
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 18 12:04:17 2014 +0200
fdo#82430: gcc-wrappers: don't stop if REAL_CXX_FLAGS is empty
Hopefully should fix MSVC 2010 build...
Change-Id: I3dc71acfa58cdf65dfc6d731d9ebb77fd18f7fac
diff --git a/solenv/gcc-wrappers/g++.cxx b/solenv/gcc-wrappers/g++.cxx
index 289d919..626b164 100644
--- a/solenv/gcc-wrappers/g++.cxx
+++ b/solenv/gcc-wrappers/g++.cxx
@@ -13,7 +13,7 @@ int main(int argc, char *argv[]) {
vectorstring rawargs(argv + 1, argv + argc);
string command=getexe(REAL_CXX);
-string flags=getexe(REAL_CXX_FLAGS);
+string flags=getexe(REAL_CXX_FLAGS, true);
string args=flags.empty() ? string() : flags + ;
args += processccargs(rawargs);
diff --git a/solenv/gcc-wrappers/gcc.cxx b/solenv/gcc-wrappers/gcc.cxx
index 8ff8148..f34c2db 100644
--- a/solenv/gcc-wrappers/gcc.cxx
+++ b/solenv/gcc-wrappers/gcc.cxx
@@ -13,7 +13,7 @@ int main(int argc, char *argv[]) {
vectorstring rawargs(argv + 1, argv + argc);
string command=getexe(REAL_CC);
-string flags=getexe(REAL_CC_FLAGS);
+string flags=getexe(REAL_CC_FLAGS, true);
string args=flags.empty() ? string() : flags + ;
args += processccargs(rawargs);
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index ccdf206..1b8d562 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -15,11 +15,14 @@
#define BUFLEN 2048
-string getexe(string exename) {
+string getexe(string exename, bool maybeempty) {
char* cmdbuf;
size_t cmdlen;
_dupenv_s(cmdbuf,cmdlen,exename.c_str());
if(!cmdbuf) {
+if (maybeempty) {
+return string();
+}
cout Error exename not defined. Did you forget to source
the environment? endl;
exit(1);
}
diff --git a/solenv/gcc-wrappers/wrapper.hxx b/solenv/gcc-wrappers/wrapper.hxx
index e2ffb01..789bc92 100644
--- a/solenv/gcc-wrappers/wrapper.hxx
+++ b/solenv/gcc-wrappers/wrapper.hxx
@@ -16,7 +16,7 @@
using namespace std;
-string getexe(string exename);
+string getexe(string exename, bool maybeempty = false);
void setupccenv();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suspicious loop: any idea?
On 16/08/14 22:42, Matteo Casalin wrote:
Hi all,
function lcl_NotifyNeighbours in sw/source/core/frmedt/feshview.cxx
has the following loop:
for( size_t j = 0; j pLst-GetMarkCount(); ++j )
{
[...]
SdrObject *pO = pLst-GetMark( 0 )-GetMarkedSdrObj();
[...]
}
I can't see any use of j inside the loop itself, and repeatedly calling
GetMark( 0 ) seems a little strange to me since I do not see any
removal of the obtained Mark (which could explain the loop). I'm not
familiar with this code, though: does anybody have an idea of whether
the loop is correct or not, and in case of how to fix it?
i think you're right, it's very suspicious and the 0 should be replaced
by j. probably the feature is obscure enough that it doesn't cause
easily noticeable problems; you have to select more than 1 fly and then
invoke some send-to-top or send-to-bottom feature.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo82492.docx |binary
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 10 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 62 --
sw/source/filter/ww8/docxattributeoutput.hxx |1
sw/source/filter/ww8/docxsdrexport.cxx|2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 91 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |3
7 files changed, 109 insertions(+), 60 deletions(-)
New commits:
commit 8b9988163c0c0d158fc2d9f5272695ccfec92237
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date: Wed Aug 13 18:14:47 2014 +0530
fdo#82492 : DOCX: Corruption: File was getting corrupt fafter RT
Issue :
- In issue file there were two runs(first run=SDT, second run=Shape).
- These two runs were consecutive(no text/space/tab was there in
between two runs).
- Due to such scenario, SdtEndBefore was not getting set on Shape.
- Hence at Export EndSdtBlock() was getting called from EndParagraph().
Due to this SDT was not getting end after first run.
In order to end SDT after run, EndSdtBlock() should get called from
EndRun()
(as in Original file)
Implementation :
- Set SdtEndBefore on Shape in DomainMapper_Impl::PushShapeContext()
- Retrieved same property at export.
- Added export unit test case.
Note :
Added common functions at Import and Export with reference to
https://gerrit.libreoffice.org/#/c/10827/
Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx
Reviewed on:
https://gerrit.libreoffice.org/10912
Change-Id: I357d77cd179c83b8ae976db331ee46c8993b6cb8
diff --git a/sw/qa/extras/ooxmlexport/data/fdo82492.docx
b/sw/qa/extras/ooxmlexport/data/fdo82492.docx
new file mode 100644
index 000..6533056
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo82492.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 9ab1ba2..d52423f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -610,6 +610,16 @@ DECLARE_OOXMLEXPORT_TEST(testfdo81946, fdo81946.docx)
assertXPath(pXmlDoc,
/w:hdr[1]/w:p[1]/w:sdt[1]/w:sdtContent[1]/w:r[2]/mc:AlternateContent[1],0);
}
+DECLARE_OOXMLEXPORT_TEST(testfdo82492, fdo82492.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+ return;
+
+// make sure there is only one run inside first SDT after RT as in the
Original file.
+assertXPath(pXmlDoc, /w:document/w:body/w:p/w:sdt[1]/w:sdtContent/w:r,1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testSdtHeader, sdt-header.docx)
{
// Problem was that w:sdt elements in headers were lost on import.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4ead526..86065cb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1917,6 +1917,41 @@ void DocxAttributeOutput::EndRunProperties( const
SwRedlineData* pRedlineData )
m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND );
}
+void DocxAttributeOutput::GetSdtEndBefore(const SdrObject* pSdrObj)
+{
+if (pSdrObj)
+{
+uno::Referencedrawing::XShape
xShape(const_castSdrObject*(pSdrObj)-getUnoShape(), uno::UNO_QUERY_THROW);
+if( xShape.is() )
+{
+uno::Reference beans::XPropertySet xPropSet( xShape,
uno::UNO_QUERY );
+uno::Reference beans::XPropertySetInfo xPropSetInfo;
+if( xPropSet.is() )
+{
+xPropSetInfo = xPropSet-getPropertySetInfo();
+uno::Sequence beans::PropertyValue aGrabBag;
+if (xPropSetInfo.is()
xPropSetInfo-hasPropertyByName(FrameInteropGrabBag))
+{
+xPropSet-getPropertyValue(FrameInteropGrabBag) =
aGrabBag;
+}
+else if(xPropSetInfo.is()
xPropSetInfo-hasPropertyByName(InteropGrabBag))
+{
+xPropSet-getPropertyValue(InteropGrabBag) = aGrabBag;
+}
+
+for (sal_Int32 nProp=0; nProp aGrabBag.getLength(); ++nProp)
+{
+if (SdtEndBefore == aGrabBag[nProp].Name
m_bStartedCharSdt !m_bEndCharSdt)
+{
+aGrabBag[nProp].Value = m_bEndCharSdt;
+break;
+}
+}
+}
+}
+}
+}
+
void DocxAttributeOutput::WritePostponedGraphic()
{
for( std::list PostponedGraphic ::const_iterator it =
m_postponedGraphic-begin();
@@ -4011,32 +4046,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
{
OSL_TRACE( TODO
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin.cxx | 158 +++---
sw/source/uibase/inc/edtwin.hxx |3
2 files changed, 117 insertions(+), 44 deletions(-)
New commits:
commit 21470afc81cd7d4c0bd165ff2877ae69f1bfc89a
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Thu Aug 7 17:35:14 2014 +0200
Change inline-edit mouse input handling
This changes the mouse click handler for input fields to the
following logic:
* If the cursor isn't already in the input field:
* On mouse over displays the POINTER_REFHAND
* A left click selects the whole text of the field and therefore
moves the cursor to the end of the field
* Same for the right click. Additionally it opens the popup menu
* If the cursor is already in the input field:
* As for normal text, the left click removes the selection and
moves the cursor to the click location.
* Right click keeps any selection and opens the popup
In contrast to normal text editing, a double click still opens
Edit fields dialog, instead of the word selection.
Change-Id: Ie7a50b34fe625358426d18eaec2e833f36702528
Reviewed-on: https://gerrit.libreoffice.org/10836
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 7cffc4b3..b20f508 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -134,6 +134,8 @@
#include docstat.hxx
#include wordcountdialog.hxx
#include swwait.hxx
+#include txtfld.hxx
+#include fmtfld.hxx
#include IMark.hxx
#include doc.hxx
@@ -548,19 +550,33 @@ void SwEditWin::UpdatePointer(const Point rLPt,
sal_uInt16 nModifier )
if (bCntAtPos || rSh.GetContentAtPos(rLPt, aUrlPos))
{
SwContentAtPos aSwContentAtPos(
-SwContentAtPos::SW_CLICKFIELD|
-SwContentAtPos::SW_INETATTR|
+SwContentAtPos::SW_FIELD |
+SwContentAtPos::SW_CLICKFIELD |
+SwContentAtPos::SW_INETATTR |
SwContentAtPos::SW_FTN |
SwContentAtPos::SW_SMARTTAG );
if( rSh.GetContentAtPos( rLPt, aSwContentAtPos) )
{
-const bool bClickToFollow = SwContentAtPos::SW_INETATTR ==
aSwContentAtPos.eCntntAtPos ||
-SwContentAtPos::SW_SMARTTAG ==
aSwContentAtPos.eCntntAtPos;
-
- if( !bClickToFollow ||
- (SwContentAtPos::SW_INETATTR ==
aSwContentAtPos.eCntntAtPos bExecHyperlinks) ||
- (SwContentAtPos::SW_SMARTTAG ==
aSwContentAtPos.eCntntAtPos bExecSmarttags) )
-eStyle = POINTER_REFHAND;
+// Is edit inline input field
+if (SwContentAtPos::SW_FIELD ==
aSwContentAtPos.eCntntAtPos)
+{
+if ( aSwContentAtPos.pFndTxtAttr != NULL
+ aSwContentAtPos.pFndTxtAttr-Which() ==
RES_TXTATR_INPUTFIELD)
+{
+const SwField *pCrsrField =
rSh.CrsrInsideInputFld() ? rSh.GetCurFld( true ) : NULL;
+if (!(pCrsrField pCrsrField ==
aSwContentAtPos.pFndTxtAttr-GetFmtFld().GetField()))
+eStyle = POINTER_REFHAND;
+}
+}
+else
+{
+const bool bClickToFollow =
SwContentAtPos::SW_INETATTR == aSwContentAtPos.eCntntAtPos ||
+
SwContentAtPos::SW_SMARTTAG == aSwContentAtPos.eCntntAtPos;
+if( !bClickToFollow ||
+(SwContentAtPos::SW_INETATTR ==
aSwContentAtPos.eCntntAtPos bExecHyperlinks) ||
+(SwContentAtPos::SW_SMARTTAG ==
aSwContentAtPos.eCntntAtPos bExecSmarttags) )
+eStyle = POINTER_REFHAND;
+}
}
}
}
@@ -2766,9 +2782,41 @@ void touch_lo_selection_end_move_impl(const void
*documentHandle,
#endif
+void SwEditWin::MoveCursor( SwWrtShell rSh, const Point aDocPos,
+const bool bOnlyText, bool bLockView )
+{
+const bool bTmpNoInterrupt = bNoInterrupt;
+bNoInterrupt = false;
+
+int nTmpSetCrsr = 0;
+
+if( !rSh.IsViewLocked() bLockView )
+rSh.LockView( true );
+else
+bLockView = false;
+
+{
+// only temporary generate move context because otherwise
+// the query to the content form doesn't work!!!
+SwMvContext aMvContext( rSh );
+nTmpSetCrsr = rSh.SetCursor(aDocPos, bOnlyText);
+bValidCrsrPos = !(CRSR_POSCHG
[Libreoffice-commits] core.git: 2 commits - basic/source connectivity/source cui/source editeng/inc editeng/source include/editeng include/svl include/svx sc/source sfx2/inc sfx2/source svtools/inc sv
basic/source/classes/sbxmod.cxx |1 - basic/source/sbx/sbxbase.cxx |1 - connectivity/source/drivers/dbase/DTable.cxx | 15 +++ cui/source/dialogs/SpellDialog.cxx |1 - cui/source/dialogs/cuicharmap.cxx|1 - cui/source/dialogs/cuifmsearch.cxx |1 - cui/source/dialogs/cuigrfflt.cxx |1 - cui/source/dialogs/cuitbxform.cxx|1 - cui/source/dialogs/dlgname.cxx |1 - cui/source/dialogs/hyphen.cxx|1 - cui/source/dialogs/iconcdlg.cxx |1 - cui/source/dialogs/postdlg.cxx |1 - cui/source/dialogs/showcols.cxx |1 - cui/source/dialogs/thesdlg.cxx |1 - cui/source/dialogs/zoom.cxx |1 - cui/source/options/fontsubs.cxx |1 - cui/source/options/optasian.cxx |1 - cui/source/options/optdict.cxx |1 - cui/source/options/optgenrl.cxx |1 - cui/source/options/optinet2.cxx |1 - cui/source/options/optjsearch.cxx|1 - cui/source/options/optlingu.cxx |1 - cui/source/options/optpath.cxx |1 - cui/source/options/optsave.cxx |1 - cui/source/tabpages/align.cxx|1 - cui/source/tabpages/autocdlg.cxx |1 + cui/source/tabpages/connect.cxx |1 - cui/source/tabpages/dstribut.cxx |1 - cui/source/tabpages/grfpage.cxx |1 - cui/source/tabpages/labdlg.cxx |1 - cui/source/tabpages/measure.cxx |1 - cui/source/tabpages/numpages.cxx |1 - cui/source/tabpages/tabline.cxx |1 - cui/source/tabpages/tabstpge.cxx |1 - cui/source/tabpages/textanim.cxx |1 - cui/source/tabpages/textattr.cxx |1 - cui/source/tabpages/tparea.cxx |1 - cui/source/tabpages/tpbitmap.cxx |1 - cui/source/tabpages/tpcolor.cxx |1 - cui/source/tabpages/tpgradnt.cxx |1 - cui/source/tabpages/tphatch.cxx |1 - cui/source/tabpages/tpline.cxx |1 - cui/source/tabpages/tplnedef.cxx |1 - cui/source/tabpages/tplneend.cxx |1 - cui/source/tabpages/tpshadow.cxx |1 - cui/source/tabpages/transfrm.cxx |1 - editeng/inc/pch/precompiled_editeng.hxx |1 - editeng/source/editeng/editdoc.cxx |1 - editeng/source/items/optitems.cxx|1 - editeng/source/items/paperinf.cxx|1 - editeng/source/misc/splwrap.cxx |1 - editeng/source/misc/unolingu.cxx |1 - include/editeng/eerdll.hxx |1 - include/editeng/itemtype.hxx |1 - include/svl/cntwall.hxx |1 - include/svx/charmap.hxx |1 - sc/source/core/data/docpool.cxx |1 - sc/source/core/data/documen7.cxx |2 -- sc/source/core/tool/autoform.cxx |1 - sc/source/core/tool/chgtrack.cxx |1 - sc/source/ui/cctrl/tbinsert.cxx |1 - sc/source/ui/miscdlgs/anyrefdg.cxx |1 - sc/source/ui/unoobj/afmtuno.cxx |1 - sfx2/inc/pch/precompiled_sfx.hxx |1 - sfx2/source/appl/appserv.cxx |1 - svtools/inc/pch/precompiled_svt.hxx |1 - svtools/source/misc/langtab.cxx |2 -- svx/inc/pch/precompiled_svx.hxx |1 - svx/inc/pch/precompiled_svxcore.hxx |1 - svx/source/customshapes/tbxcustomshapes.cxx |1 - svx/source/dialog/_bmpmask.cxx |1 - svx/source/dialog/_contdlg.cxx |1 - svx/source/dialog/checklbx.cxx |2 -- svx/source/dialog/ctredlin.cxx |1 - svx/source/dialog/dlgctrl.cxx|1 - svx/source/dialog/fontwork.cxx |1 - svx/source/dialog/grfflt.cxx |1 - svx/source/dialog/hdft.cxx |1 - svx/source/dialog/imapdlg.cxx|1 - svx/source/dialog/langbox.cxx|1 - svx/source/dialog/optgrid.cxx|1 - svx/source/dialog/prtqry.cxx |1 - svx/source/dialog/rubydialog.cxx |1 - svx/source/dialog/strarray.cxx |2 -- svx/source/dialog/svxbmpnumvalueset.cxx |1 - svx/source/dialog/svxruler.cxx |1 - svx/source/dialog/txenctab.cxx |7 --- svx/source/engine3d/dragmt3d.cxx |1 - svx/source/engine3d/float3d.cxx |1 - svx/source/engine3d/view3d.cxx |1 -
Re: [PATCH 01/17] XSLT: Better error messages in measure_conversion.xsl
Hi Andrew! Am 14.08.2014 23:53, schrieb andrew-libreoffice@pileofstuff.org: From: Andrew Sayers andrew-libreoffice@pileofstuff.org Earlier this year I needed to do some work with HTML document export. This patchset represents the sundry improvements I made along the way. The code has been stable for a while now, so I've rebased it and sent it in. I don't expect to make any more changes at this point, Murphy notwithstanding. Note: some of these patches deal with trailing spaces and mixed Windows/Unix newlines. To make the patches cleanly apply, I needed to do: git am -p0 --keep-cr patches/* Thanks for the patches, but they won't be accepted in this form. Please follow https://wiki.documentfoundation.org/Development/gerrit to commit these changes and don't forget to add yourself to https://wiki.documentfoundation.org/Development/Developers and send your license statement as stated in the above Wiki page. Regards, Jan-Marek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Suspicious loop: any idea?
On Mon, Aug 18, 2014 at 12:37:51PM +0200, Michael Stahl wrote: i think you're right, it's very suspicious and the 0 should be replaced by j. probably the feature is obscure enough that it doesn't cause easily noticeable problems; you have to select more than 1 fly and then invoke some send-to-top or send-to-bottom feature. FWIW, I quick look at history shows this was around like that since initial import in 2000. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/compat.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 2d73a9d7e8541397595021377ee67c56e6d22c03 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 18 14:11:25 2014 +0200 Remove unnecessary #include Change-Id: I7064bfd29f5ce4da2cb46d5b7e9984bc21b16f41 diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx index 9e10cba..d1a7dc8 100644 --- a/cppuhelper/source/compat.cxx +++ b/cppuhelper/source/compat.cxx @@ -21,7 +21,6 @@ #include cstdlib -#include com/sun/star/loader/CannotActivateFactoryException.hpp #include com/sun/star/uno/Exception.hpp #include com/sun/star/uno/Reference.hxx #include com/sun/star/uno/Sequence.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc
sd/inc/CustomAnimationEffect.hxx | 252 +++
sd/inc/CustomAnimationPreset.hxx | 40 +++---
sd/inc/anminfo.hxx | 14 +-
sd/inc/drawdoc.hxx | 250 +++---
sd/inc/stlpool.hxx | 94 +++---
5 files changed, 325 insertions(+), 325 deletions(-)
New commits:
commit d4cf8c2518c77631f91db8564bf3a506f0ab8e70
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 18 14:14:47 2014 +0200
Generally better to have DLLPUBLIC class with some DLLPRIVATE members
...in the same vein as 80a1a2599e04142683d2286d0e32d0e13fb45de3.
Change-Id: I330665957aec2c9b98c7aff7fa7f25525e4cdf7d
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index f39633a..6c7fabb 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -52,132 +52,132 @@ typedef std::list CustomAnimationEffectPtr
EffectSequence;
class EffectSequenceHelper;
-class CustomAnimationEffect
+class SD_DLLPUBLIC CustomAnimationEffect
{
friend class MainSequence;
friend class EffectSequenceHelper;
public:
-SD_DLLPUBLIC CustomAnimationEffect( const
::com::sun::star::uno::Reference ::com::sun::star::animations::XAnimationNode
xNode );
-SD_DLLPUBLIC virtual ~CustomAnimationEffect();
+CustomAnimationEffect( const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode xNode );
+virtual ~CustomAnimationEffect();
-const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode getNode() const { return
mxNode; }
-void setNode( const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode xNode );
-void replaceNode( const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode xNode );
+SAL_DLLPRIVATE const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode getNode() const { return
mxNode; }
+SAL_DLLPRIVATE void setNode( const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode xNode );
+SAL_DLLPRIVATE void replaceNode( const ::com::sun::star::uno::Reference
::com::sun::star::animations::XAnimationNode xNode );
-CustomAnimationEffectPtr clone() const;
+SAL_DLLPRIVATE CustomAnimationEffectPtr clone() const;
// attributes
-const OUStringgetPresetId() const { return maPresetId; }
-const OUStringgetPresetSubType() const { return maPresetSubType; }
-const OUStringgetProperty() const { return maProperty; }
+SAL_DLLPRIVATE const OUStringgetPresetId() const { return maPresetId;
}
+SAL_DLLPRIVATE const OUStringgetPresetSubType() const { return
maPresetSubType; }
+SAL_DLLPRIVATE const OUStringgetProperty() const { return maProperty;
}
-sal_Int16 getPresetClass() const { return mnPresetClass; }
-voidsetPresetClass( sal_Int16 nPresetClass );
+SAL_DLLPRIVATE sal_Int16 getPresetClass() const { return
mnPresetClass; }
+SAL_DLLPRIVATE voidsetPresetClass( sal_Int16
nPresetClass );
-sal_Int16 getNodeType() const { return mnNodeType; }
-SD_DLLPUBLIC void setNodeType( sal_Int16 nNodeType );
+SAL_DLLPRIVATE sal_Int16 getNodeType() const { return mnNodeType; }
+void setNodeType( sal_Int16 nNodeType );
-::com::sun::star::uno::Any getRepeatCount() const;
-voidsetRepeatCount( const ::com::sun::star::uno::Any
rRepeatCount );
+SAL_DLLPRIVATE ::com::sun::star::uno::Any getRepeatCount()
const;
+SAL_DLLPRIVATE voidsetRepeatCount( const
::com::sun::star::uno::Any rRepeatCount );
-::com::sun::star::uno::Any getEnd() const;
-voidsetEnd( const ::com::sun::star::uno::Any rEnd );
+SAL_DLLPRIVATE ::com::sun::star::uno::Any getEnd() const;
+SAL_DLLPRIVATE voidsetEnd( const ::com::sun::star::uno::Any
rEnd );
-sal_Int16 getFill() const;
-voidsetFill( sal_Int16 nFill );
+SAL_DLLPRIVATE sal_Int16 getFill() const;
+SAL_DLLPRIVATE voidsetFill( sal_Int16 nFill );
-double getBegin() const { return mfBegin; }
-SD_DLLPUBLIC void setBegin( double fBegin );
+SAL_DLLPRIVATE double getBegin() const { return mfBegin; }
+void setBegin( double fBegin );
-double getDuration() const { return mfDuration; }
-SD_DLLPUBLIC void setDuration( double fDuration );
+SAL_DLLPRIVATE double getDuration() const { return mfDuration; }
+void setDuration( double fDuration );
-double getAbsoluteDuration() const { return mfAbsoluteDuration; }
+SAL_DLLPRIVATE double getAbsoluteDuration() const { return
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source
connectivity/source/drivers/dbase/DTable.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit c80754dac761b8489250c1ede510fb76b98cc590
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 18 12:07:27 2014 +0100
check len before memcpying into it
valgrind + bff on sf_3e0068c9b19bb548826bed0599f65745-CrdWMI-minimized.gif
Change-Id: I74cc21609f1c97a27e13615593f678cbbc8463e3
(cherry picked from commit d4e64d030092984077021a9af9d281cd64c476bf)
Reviewed-on: https://gerrit.libreoffice.org/10991
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 9dd02ba..6036194 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -799,6 +799,7 @@ bool ODbaseTable::fetchRow(OValueRefRow _rRow, const
OSQLColumns _rCols, bool
(*aIter)-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))
= nLen;
(*aIter)-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))
= nType;
}
+
switch(nType)
{
case DataType::INTEGER:
@@ -875,6 +876,8 @@ bool ODbaseTable::fetchRow(OValueRefRow _rRow, const
OSQLColumns _rCols, bool
else if ( DataType::INTEGER == nType )
{
sal_Int32 nValue = 0;
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(nValue, pData, nLen);
*(_rRow-get())[i] = nValue;
}
@@ -884,6 +887,8 @@ bool ODbaseTable::fetchRow(OValueRefRow _rRow, const
OSQLColumns _rCols, bool
if
(getBOOL((*aIter)-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY
// Currency is treated separately
{
sal_Int64 nValue = 0;
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(nValue, pData, nLen);
if ( m_aScales[i-1] )
@@ -893,6 +898,8 @@ bool ODbaseTable::fetchRow(OValueRefRow _rRow, const
OSQLColumns _rCols, bool
}
else
{
+if (static_castsize_t(nLen) sizeof(d))
+return false;
memcpy(d, pData, nLen);
}
@@ -1852,6 +1859,8 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector rRow,
OValueRefRow pOrgRow, cons
case DataType::INTEGER:
{
sal_Int32 nValue = thisColVal;
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(pData,nValue,nLen);
}
break;
@@ -1867,10 +1876,16 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector rRow,
OValueRefRow pOrgRow, cons
nValue = (sal_Int64)(d *
pow(10.0,(int)m_aScales[i]));
else
nValue = (sal_Int64)(d);
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(pData,nValue,nLen);
} // if
(getBOOL(xCol-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY
// Currency is treated separately
else
+{
+if (static_castsize_t(nLen) sizeof(d))
+return false;
memcpy(pData,d,nLen);
+}
}
break;
case DataType::DECIMAL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source
connectivity/source/drivers/dbase/DTable.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 038c0ce3583a659b57ff3365589907683e29e0a1
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 18 12:07:27 2014 +0100
check len before memcpying into it
valgrind + bff on sf_3e0068c9b19bb548826bed0599f65745-CrdWMI-minimized.gif
Change-Id: I74cc21609f1c97a27e13615593f678cbbc8463e3
(cherry picked from commit d4e64d030092984077021a9af9d281cd64c476bf)
Reviewed-on: https://gerrit.libreoffice.org/10992
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 06e0bcc..db6cad7 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -816,6 +816,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow _rRow,const
OSQLColumns _rCols, s
(*aIter)-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))
= nLen;
(*aIter)-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))
= nType;
}
+
switch(nType)
{
case DataType::INTEGER:
@@ -892,6 +893,8 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow _rRow,const
OSQLColumns _rCols, s
else if ( DataType::INTEGER == nType )
{
sal_Int32 nValue = 0;
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(nValue, pData, nLen);
*(_rRow-get())[i] = nValue;
}
@@ -901,6 +904,8 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow _rRow,const
OSQLColumns _rCols, s
if
(getBOOL((*aIter)-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY
// Currency is treated separately
{
sal_Int64 nValue = 0;
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(nValue, pData, nLen);
if ( m_aScales[i-1] )
@@ -910,6 +915,8 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow _rRow,const
OSQLColumns _rCols, s
}
else
{
+if (static_castsize_t(nLen) sizeof(d))
+return false;
memcpy(d, pData, nLen);
}
@@ -1881,6 +1888,8 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector rRow,
OValueRefRow pOrgRow,
case DataType::INTEGER:
{
sal_Int32 nValue = thisColVal;
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(pData,nValue,nLen);
}
break;
@@ -1896,10 +1905,16 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector
rRow, OValueRefRow pOrgRow,
nValue = (sal_Int64)(d *
pow(10.0,(int)m_aScales[i]));
else
nValue = (sal_Int64)(d);
+if (static_castsize_t(nLen) sizeof(nValue))
+return false;
memcpy(pData,nValue,nLen);
} // if
(getBOOL(xCol-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY
// Currency is treated separately
else
+{
+if (static_castsize_t(nLen) sizeof(d))
+return false;
memcpy(pData,d,nLen);
+}
}
break;
case DataType::DECIMAL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source svl/source
cui/source/tabpages/numfmt.cxx | 18 +++---
svl/source/numbers/zformat.cxx | 14 --
2 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 839cc63e7d1b78c56e04bafb46037e898ce2c455
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 14:09:20 2014 +0200
prevent out-of-bounds string access
... while entering a * star symbol format code and there's no fill
character following the * yet.
Change-Id: I006f125ceefccba6a95ea033fd434d98e5d4f1c2
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index c235cfa..1577c2a 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -113,9 +113,21 @@ void SvxNumberPreview::NotifyChange( const OUString
rPrevStr,
mnPos = aPrevStr.indexOf( 0x1B );
if ( mnPos != -1 )
{
-mnChar = aPrevStr[ mnPos + 1 ];
-// delete placeholder and char to repeat
-aPrevStr = aPrevStr.replaceAt( mnPos, 2, );
+// Right during user input the star symbol is the very
+// last character before the user enters another one.
+if (mnPos aPrevStr.getLength() - 1)
+{
+mnChar = aPrevStr[ mnPos + 1 ];
+// delete placeholder and char to repeat
+aPrevStr = aPrevStr.replaceAt( mnPos, 2, );
+}
+else
+{
+// delete placeholder
+aPrevStr = aPrevStr.replaceAt( mnPos, 1, );
+// do not attempt to draw a 0 fill character
+mnPos = -1;
+}
}
svtools::ColorConfig aColorConfig;
Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR
).nColor );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 5815cac..69e0059 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2590,8 +2590,18 @@ bool SvNumberformat::GetOutputString(double fNumber,
if( bStarFlag )
{
sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+const OUString rStr =rInfo.sStrArray[i];
+// Right during user input the star symbol is the very
+// last character before the user enters another one.
+if (rStr.getLength() 1)
+{
+sBuff.append(rStr[1]);
+bRes = true;
+}
+else
+{
+bRes = false;
+}
}
break;
case NF_SYMBOLTYPE_BLANK:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/source svx/source sw/source
cui/source/tabpages/textattr.cxx |4 ++--
filter/source/msfilter/msdffimp.cxx|2 +-
include/svx/sdtcfitm.hxx | 11 +++
sc/source/ui/drawfunc/drtxtob.cxx |2 +-
sd/source/core/sdpage.cxx |2 +-
sd/source/ui/view/drviews2.cxx |2 +-
svx/source/sdr/primitive2d/sdrattributecreator.cxx |2 +-
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdotext.cxx |2 +-
sw/source/filter/ww8/ww8par.cxx|2 +-
sw/source/uibase/shells/drwtxtsh.cxx |2 +-
11 files changed, 14 insertions(+), 19 deletions(-)
New commits:
commit 08edafa656dc15089fad4d07c71fe40585f89f4b
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 18 14:56:20 2014 +0200
Consistency around SdrOnOffItem in svx/sdtcfitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: Ib461b5d3702e00a9d7cef3229c44e3328c776e1d
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index a09a7ee..2b6e531 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -304,7 +304,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
if( rAttrs-GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE
)
{
-bool bContour = ( ( const SdrTextContourFrameItem )rAttrs-Get(
SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
+bool bContour = ( ( const SdrOnOffItem )rAttrs-Get(
SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
m_pTsbContour-SetState( bContour ? TRISTATE_TRUE : TRISTATE_FALSE );
m_pTsbContour-EnableTriState( false );
}
@@ -381,7 +381,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
eState = m_pTsbContour-GetState();
if( m_pTsbContour-IsValueChangedFromSaved() )
{
-rAttrs-Put( SdrTextContourFrameItem( TRISTATE_TRUE == eState ) );
+rAttrs-Put( makeSdrTextContourFrameItem( TRISTATE_TRUE == eState ) );
}
eState = m_pTsbFitToSize-GetState();
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 293e439..b6bf96d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5147,7 +5147,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream rSt,
}
break;
case mso_wrapByPoints :
-aSet.Put( SdrTextContourFrameItem( true ) );
+aSet.Put( makeSdrTextContourFrameItem( true ) );
break;
default: break;
}
diff --git a/include/svx/sdtcfitm.hxx b/include/svx/sdtcfitm.hxx
index 8a9cb61..aca6298 100644
--- a/include/svx/sdtcfitm.hxx
+++ b/include/svx/sdtcfitm.hxx
@@ -22,14 +22,9 @@
#include svx/sdooitm.hxx
#include svx/svddef.hxx
-/*
- * class SdrTextContourFrameItem
- */
-class SdrTextContourFrameItem: public SdrOnOffItem {
-public:
-SdrTextContourFrameItem(bool bOn=false):
SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
-SdrTextContourFrameItem(SvStream rIn) :
SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,rIn) {}
-};
+inline SdrOnOffItem makeSdrTextContourFrameItem(bool bOn) {
+return SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME, bOn);
+}
#endif
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index ba9f349..08dc34c 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -1178,7 +1178,7 @@ void
ScDrawTextObjectBar::GetStatePropPanelAttr(SfxItemSet rSet)
SfxItemState eConState = aEditAttr.GetItemState(
SDRATTR_TEXT_CONTOURFRAME );
if( eConState != SFX_ITEM_DONTCARE )
{
-bContour = ( ( const SdrTextContourFrameItem
)aEditAttr.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
+bContour = ( ( const SdrOnOffItem )aEditAttr.Get(
SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
}
if (bContour) break;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 4a631d9..7d875f7 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -535,7 +535,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool
bVertical, const Rec
eObjKind == PRESOBJ_GRAPHIC )
{
SfxItemSet aSet( ((SdDrawDocument*) pModel)-GetPool() );
-aSet.Put( SdrTextContourFrameItem( true ) );
+aSet.Put( makeSdrTextContourFrameItem( true ) );
aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
pSdrObj-SetMergedItemSet(aSet);
diff --git a/sd/source/ui/view/drviews2.cxx
[Bug 44580] share autocorrect replacement table for misc. language subgroups
https://bugs.freedesktop.org/show_bug.cgi?id=44580 --- Comment #9 from tommy27 ba...@quipo.it --- WOW!!! Well done Julien, your fix for Bug 79276 could represent a solution for the current bug as well. If I copy one of those autocorrect .dat file and manually remove the final sublocalization tag (i.e. acor_it-IT.dat → acor_it.dat) and I place it in the autocorr subfolder of the user profile it will work as an unlocalized autocorrect version for that language. That means that autocorrect entries in the acor_it.dat file will be applied either in documents written in Italian (Italy) or in Italian (Switzerland). The same will apply to an acor_en.dat file which could be an universal autocorrect replacement for all english variants as well. The only thing which is missing is that those unlocalized acor.dat files actually are not shown in the UI of the Tools/autocorrect options/Replace, so you have no way to edit od add or remove those entries. If you find a way to make those unlocalized acor.dat files editable in the UI the fix will be complete. We also have to decide how those unlocalized autocorrect lists should look in the language list I mean, we have Italian (Italy) for acor_it-IT.dat and Italian (Switzerland) for acor_it-CH.dat, what we should visualize for acor_it.dat? Maybe we should keep it simple and display it only as Italian rather than Italian (unlocalized) or Italian (common) or Italian (General) etc.etc. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/mac-opengl-fixes' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Canvas.xcu |1 - 1 file changed, 1 deletion(-) New commits: commit 0db840fa15fb5662f3199f0ca67dc7421418ff26 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Aug 18 15:27:44 2014 +0200 avoid picking the incomplete OGL canvas Change-Id: Ia7e47d599eddc5c3ae192a6bebc3c84cd059e81a diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu index 8851827..f1d965e 100644 --- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu @@ -48,7 +48,6 @@ prop oor:name=PreferredImplementations oor:type=oor:string-list value oor:separator=,com.sun.star.comp.rendering.SpriteCanvas.DX9, com.sun.star.comp.rendering.SpriteCanvas.Cairo, - com.sun.star.comp.rendering.SpriteCanvas.OGL, com.sun.star.comp.rendering.SpriteCanvas.VCL /value /prop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc
sd/inc/stlpool.hxx | 94 ++---
1 file changed, 47 insertions(+), 47 deletions(-)
New commits:
commit aa1d3d5eeaa795f6b913bbcd55bd31dc6802a4fe
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 18 15:31:41 2014 +0200
Partial revert of d4cf8c2518c77631f91db8564bf3a506f0ab8e70
Generally better to have DLLPUBLIC class with some DLLPRIVATE members.
MSVC
over-eagerly also treats the SdStyleSheetPoolBase template specialization as
dllexport and fails to generate code for the ImplInheritanceHelper4() ctor
because the SfxStyleSheetPool base class has no default ctor.
Change-Id: I656c898ebd3d4ca58785084c5aeed4fa670cb7e0
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 276783a..ae14609 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -52,19 +52,19 @@ typedef ::cppu::ImplInheritanceHelper4 SfxStyleSheetPool,
::com::sun::star::container::XNameAccess,
::com::sun::star::lang::XComponent
SdStyleSheetPoolBase;
-class SD_DLLPUBLIC SdStyleSheetPool : public SdStyleSheetPoolBase, public
SfxListener
+class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
{
friend class SdDrawDocument;
public:
-SAL_DLLPRIVATE SdStyleSheetPool(SfxItemPool const
rPool, SdDrawDocument* pDocument);
+SdStyleSheetPool(SfxItemPool const rPool,
SdDrawDocument* pDocument);
-SAL_DLLPRIVATE voidSetActualStyleSheet(SfxStyleSheetBase*
pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; }
-SAL_DLLPRIVATE SfxStyleSheetBase* GetActualStyleSheet()
{ return mpActualStyleSheet; }
+voidSetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet)
{ mpActualStyleSheet = pActStyleSheet; }
+SfxStyleSheetBase* GetActualStyleSheet()
{ return mpActualStyleSheet; }
-SAL_DLLPRIVATE SfxStyleSheetBase* GetTitleSheet(const OUString
rLayoutName);
+SfxStyleSheetBase* GetTitleSheet(const OUString rLayoutName);
// Caller has to delete the list
-SAL_DLLPRIVATE voidCreateOutlineSheetList(const OUString
rLayoutName, std::vectorSfxStyleSheetBase* rOutlineStyles);
+voidCreateOutlineSheetList(const OUString rLayoutName,
std::vectorSfxStyleSheetBase* rOutlineStyles);
/** creates all layout style sheets for the given layout name if they
don't exist yet.
@@ -74,69 +74,69 @@ public:
had to be created. This is used to assert errors
in documents
when styles are missing.
*/
-voidCreateLayoutStyleSheets(const OUString rLayoutName,
bool bCheck = false );
-SAL_DLLPRIVATE voidCreateLayoutSheetNames(const OUString
rLayoutName, std::vectorOUString aNameList) const;
-SAL_DLLPRIVATE voidCreateLayoutSheetList(const OUString
rLayoutName, SdStyleSheetVector rLayoutSheets);
-SAL_DLLPRIVATE voidCopyLayoutSheets(const OUString
rLayoutName, SdStyleSheetPool rSourcePool, SdStyleSheetVector rCreatedSheets
);
-SAL_DLLPRIVATE voidCopyGraphicSheets(SdStyleSheetPool
rSourcePool);
-SAL_DLLPRIVATE voidCopyCellSheets(SdStyleSheetPool
rSourcePool);
-SAL_DLLPRIVATE voidCopyTableStyles(SdStyleSheetPool
rSourcePool);
-SAL_DLLPRIVATE voidCopyCellSheets(SdStyleSheetPool
rSourcePool, SdStyleSheetVector rCreatedSheets);
-SAL_DLLPRIVATE void
RenameAndCopyGraphicSheets(SdStyleSheetPool rSourcePool, SdStyleSheetVector
rCreatedSheets, OUString rRenameSuffix);
+SD_DLLPUBLIC voidCreateLayoutStyleSheets(const OUString
rLayoutName, bool bCheck = false );
+voidCreateLayoutSheetNames(const OUString rLayoutName,
std::vectorOUString aNameList) const;
+voidCreateLayoutSheetList(const OUString rLayoutName,
SdStyleSheetVector rLayoutSheets);
+voidCopyLayoutSheets(const OUString rLayoutName,
SdStyleSheetPool rSourcePool, SdStyleSheetVector rCreatedSheets );
+voidCopyGraphicSheets(SdStyleSheetPool rSourcePool);
+voidCopyCellSheets(SdStyleSheetPool rSourcePool);
+voidCopyTableStyles(SdStyleSheetPool rSourcePool);
+voidCopyCellSheets(SdStyleSheetPool rSourcePool,
SdStyleSheetVector rCreatedSheets);
+voidRenameAndCopyGraphicSheets(SdStyleSheetPool
rSourcePool, SdStyleSheetVector rCreatedSheets, OUString rRenameSuffix);
-SAL_DLLPRIVATE voidCreatePseudosIfNecessary();
-SAL_DLLPRIVATE voidUpdateStdNames();
-SAL_DLLPRIVATE static void PutNumBulletItem(
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/exportdata/ooxml/pass/sdt-in-shape-with-textbox.docx |binary
sw/qa/core/filters-test.cxx |9
+
sw/source/filter/ww8/docxsdrexport.cxx |9
+
3 files changed, 18 insertions(+)
New commits:
commit f6b681a1360d953ec7a9f2f4f843c0d76d478c2a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 18 15:14:31 2014 +0200
DOCX export: don't forget to close SDT elements inside the TextBoxes of
shapes
A usual problem with SDT is that in case it should end after the last
paragrah of a container, there is no next paragraph that could have
the relevant EndSdtBefore property. This is usually handled by closing
the SDT tag before the container is closed.
The problem here was that DocxAttributeOutput::WriteSdtBlock() did not
notify DocxSdrExport about opening the SDT, as it thought there is no
draw export in progress. This is because in case of shape with a
TextBox, the common writeDMLAndVMLDrawing() method is not called,
instead the separate writeDMLTextFrame() and writeVMLTextFrame() methods
are invoked.
Fix the problem by adjusting these methods to writeDMLAndVMLDrawing(),
so that they also set m_bDMLAndVMLDrawingOpen to true during the TextBox
export.
Change-Id: Ie08b0b955cd2d6a645970da3d485e447abfd6495
diff --git a/sw/qa/core/exportdata/ooxml/fail/.gitignore
b/sw/qa/core/exportdata/ooxml/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/exportdata/ooxml/indeterminate/.gitignore
b/sw/qa/core/exportdata/ooxml/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/exportdata/ooxml/pass/sdt-in-shape-with-textbox.docx
b/sw/qa/core/exportdata/ooxml/pass/sdt-in-shape-with-textbox.docx
new file mode 100644
index 000..be033f1
Binary files /dev/null and
b/sw/qa/core/exportdata/ooxml/pass/sdt-in-shape-with-textbox.docx differ
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 2a80f3ef..8c128c3 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -188,6 +188,15 @@ void SwFiltersTest::testCVEs()
0,
0,
/*bExport=*/true);
+
+testDir(MS Word 2007 XML,
+getURLFromSrc(/sw/qa/core/exportdata/ooxml/),
+OUString(),
+SFX_FILTER_STARONEFILTER,
+0,
+0,
+/*bExport=*/true);
+
}
void SwFiltersTest::setUp()
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index bd34f04..b1aa910 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1314,6 +1314,9 @@ void DocxSdrExport::writeOnlyTextOfFrame(sw::Frame*
pParentFrame)
void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId,
bool bTextBoxOnly)
{
+bool bDMLAndVMLDrawingOpen = m_pImpl-m_bDMLAndVMLDrawingOpen;
+m_pImpl-m_bDMLAndVMLDrawingOpen = true;
+
sax_fastparser::FSHelperPtr pFS = m_pImpl-m_pSerializer;
const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt();
const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
@@ -1542,10 +1545,14 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame*
pParentFrame, int nAnchorId, bo
endDMLAnchorInline(rFrmFmt);
}
+m_pImpl-m_bDMLAndVMLDrawingOpen = bDMLAndVMLDrawingOpen;
}
void DocxSdrExport::writeVMLTextFrame(sw::Frame* pParentFrame, bool
bTextBoxOnly)
{
+bool bDMLAndVMLDrawingOpen = m_pImpl-m_bDMLAndVMLDrawingOpen;
+m_pImpl-m_bDMLAndVMLDrawingOpen = true;
+
sax_fastparser::FSHelperPtr pFS = m_pImpl-m_pSerializer;
const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt();
const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
@@ -1633,6 +1640,8 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame*
pParentFrame, bool bTextBoxOnly
pFS-endElementNS(XML_w, XML_pict);
}
m_pImpl-m_bFrameBtLr = false;
+
+m_pImpl-m_bDMLAndVMLDrawingOpen = bDMLAndVMLDrawingOpen;
}
bool DocxSdrExport::checkFrameBtlr(SwNode* pStartNode,
sax_fastparser::FastAttributeList* pTextboxAttrList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - svl/source
svl/source/numbers/zformat.cxx | 66 +++--
1 file changed, 32 insertions(+), 34 deletions(-)
New commits:
commit 349c93e0f5c9f231b2ff6854fcb795ca5881ca2d
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 15:55:14 2014 +0200
more out-of-bounds string accesses
Change-Id: Id5df5775e4c5bfb1c484e60e6831f6bc77158d35
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 271a331..633b803 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2242,6 +2242,30 @@ short SvNumberformat::ImpCheckCondition(double fNumber,
}
}
+static bool lcl_appendStarFillChar( OUStringBuffer rBuf, const OUString rStr
)
+{
+// Right during user input the star symbol is the very
+// last character before the user enters another one.
+if (rStr.getLength() 1)
+{
+rBuf.append((sal_Unicode) 0x1B);
+rBuf.append(rStr[1]);
+return true;
+}
+return false;
+}
+
+static bool lcl_insertStarFillChar( OUStringBuffer rBuf, sal_Int32 nPos,
const OUString rStr )
+{
+if (rStr.getLength() 1)
+{
+rBuf.insert( nPos, rStr[1]);
+rBuf.insert( nPos, (sal_Unicode) 0x1B);
+return true;
+}
+return false;
+}
+
bool SvNumberformat::GetOutputString(const OUString sString,
OUString OutString,
Color** ppColor)
@@ -2274,9 +2298,7 @@ bool SvNumberformat::GetOutputString(const OUString
sString,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sOutBuff.append((sal_Unicode) 0x1B);
-sOutBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sOutBuff,
rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -2589,15 +2611,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-const OUString rStr =rInfo.sStrArray[i];
-// Right during user input the star symbol is the very
-// last character before the user enters another one.
-if (rStr.getLength() 1)
-{
-sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rStr[1]);
-bRes = true;
-}
+bRes = lcl_appendStarFillChar( sBuff,
rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -3221,9 +3235,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode)0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff, rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -3719,9 +3731,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff, rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -4014,9 +4024,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff, rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -4347,9 +4355,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sStr.insert(k, rInfo.sStrArray[j][1]);
-sStr.insert(k, (sal_Unicode) 0x1B);
-bRes = true;
+bRes = lcl_insertStarFillChar( sStr, k,
rInfo.sStrArray[j]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -4482,9 +4488,7 @@ bool SvNumberformat::ImpNumberFillWithThousands(
OUStringBuffer sBuff, // numb
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.insert(k, rInfo.sStrArray[j][1]);
-sBuff.insert(k, (sal_Unicode) 0x1B);
-bRes = true;
+bRes = lcl_insertStarFillChar( sBuff, k, rInfo.sStrArray[j]);
Re: user profile in testing
On 08/17/2014 06:54 PM, Terrence Enger wrote: It is possible to direct LibreOffice to a particular user profile directory using the command line parameter -env:UserInstallation=URL, and I have grown into the habit of using a separate user profile for each bug report I look at. I think that this parameter inhibits the usual conversion of user profiles across versions of LibreOffice. Is this right? No; what happens exactly is: Whenever at LO 4 start-up no LO 4 user profile exists (e.g. because -env:UserInstallation points to a directory that does not exist) and a LO 3 user profile exists at the canonic location (i.e., not taking into account any -env:UserInstallation) and the LO 3 user profile does not contain a MIGRATED4 marker file, then the MIGRATED4 marker file is written into the LO 3 user profile and data from the LO 3 user profile is migrated into the newly created LO 4 user profile. Is it a reportable bug if LibreOffice crashes when using a user profile created by an earlier version? ( I tend to the position that every crash is a bug, but I can well see that a lot of bugs RESOLVED WONTFIX could become annoying. ) Such crashes should generally be considered bugs that should be fixed. An exception is when the user profile data that causes the crash can only have been produced by a non-official LO version (e.g. a nightly snapshot). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 221d874ec8168eb9fcdf97605b71eaf9227815f4
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 18 16:15:01 2014 +0200
Fix -Werror=sign-compare
Change-Id: I5c5f31a4970c1c5f2930dd3ae99a46c568101ac4
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index ce4ec43..d8673c0 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -282,9 +282,9 @@ uno::Reference xml::sax::XFastContextHandler SAL_CALL
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference xml::sax::XFastContextHandler xResult;
-if ((Element 0x) != NMSP_mce !m_bDiscardChildren)
+if (oox::getNamespace(Element) != NMSP_mce !m_bDiscardChildren)
xResult.set(lcl_createFastChildContext(Element, Attribs));
-else if ((Element 0x) == NMSP_mce)
+else if (oox::getNamespace(Element) == NMSP_mce)
xResult = this;
return xResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/svdfppt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8fa219fbb5101b661ce0e9aabceb52d3981ffe88 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 18 16:29:25 2014 +0200 Downcast to wrong SfxPoolItem sub-type Change-Id: I9f4dc2f470f94d6f7cc2959e368fda419d9482c4 diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 90d3b46..cacf65c 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7257,7 +7257,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference XCell xCell ) xPropSet-setPropertyValue( sTextVerticalAdjust, Any( eVA ) ); //set textHorizontalAdjust and TextWritingMode attr -const sal_Int32 eHA(((const SdrMetricItem)pObj-GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue()); +const sal_Int32 eHA(((const SdrTextHorzAdjustItem)pObj-GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue()); const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem)pObj-GetMergedItem(EE_PARA_WRITINGDIR)).GetValue()); static const OUString sHorizontalAdjust( TextHorizontalAdjust ); static const OUString sWritingMode( TextWritingMode ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforscan.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit bf674ab0f3097ad122c727b4d86f004f8cce1f61
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 16:28:32 2014 +0200
detect * with no character following as invalid format code
... so adding it to the list in Format Numbers using the checkmark
button is not possible.
Change-Id: I57ca6a7a3617583a82a99c87291373b1fe4e246d
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 68959bc..813dede 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -933,6 +933,11 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const
OUString rString)
}
else
{
+// Valid only if there is a character following, else we are
+// at the end of a code that does not have a fill character
+// (yet?).
+if (sStrArray[nAnzStrings].getLength() 2)
+return nPos;
bStar = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - chart2/source
chart2/source/view/charttypes/PieChart.cxx | 35 ++---
1 file changed, 13 insertions(+), 22 deletions(-)
New commits:
commit 65b09ff5975f1c53ed33870ffa974fbf8b94279d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Aug 15 13:25:39 2014 -0400
Annotate code remove unnecessary scope.
Change-Id: I4b8ccef5125c52c48e5d9757bb1f245bf73d0629
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 1f52415..3edf2af 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -46,7 +46,7 @@ struct PieChart::ShapeParam
double mfUnitCircleOuterRadius;
double mfUnitCircleInnerRadius;
double mfExplodePercentage;
-double mfLogicYSum;
+double mfLogicYSum; // sum of all Y values in a single series.
double mfLogicZ;
double mfDepth;
@@ -227,6 +227,7 @@ void PieChart::createTextLabelShape(
VDataSeries rSeries, sal_Int32 nPointIndex, ShapeParam rParam )
{
if (!rSeries.getDataPointLabelIfLabel(nPointIndex))
+// There is no text label for this data point. Nothing to do.
return;
if (!rtl::math::approxEqual(rParam.mfExplodePercentage, 0.0))
@@ -254,6 +255,7 @@ void PieChart::createTextLabelShape(
nScreenValueOffsetInRadiusDirection = (3!=m_nDimension) ? 150 :
0;//todo maybe calculate this font height dependent
else if( nLabelPlacement ==
::com::sun::star::chart::DataLabelPlacement::INSIDE )
nScreenValueOffsetInRadiusDirection = (3!=m_nDimension) ? -150 :
0;//todo maybe calculate this font height dependent
+
PolarLabelPositionHelper
aPolarPosHelper(m_pPosHelper,m_nDimension,m_xLogicTarget,m_pShapeFactory);
awt::Point aScreenPosition2D(
aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment,
nLabelPlacement
@@ -438,6 +440,7 @@ void PieChart::createShapes()
bool bHasFillColorMapping = pSeries-hasPropertyMapping(FillColor);
+// Counter-clockwise offset from the 3 o'clock position.
m_pPosHelper-m_fAngleDegreeOffset = pSeries-getStartingAngle();
//iterate through all points to get the sum
@@ -456,6 +459,7 @@ void PieChart::createShapes()
}
if (aParam.mfLogicYSum == 0.0)
+// Total sum of all Y values in this series is zero. Skip the
whole series.
continue;
double fLogicYForNextPoint = 0.0;
@@ -507,13 +511,11 @@ void PieChart::createShapes()
//point color:
boost::scoped_ptr tPropertyNameValueMap
apOverwritePropertiesMap(NULL);
+if (!pSeries-hasPointOwnColor(nPointIndex)
m_xColorScheme.is())
{
-if(!pSeries-hasPointOwnColor(nPointIndex)
m_xColorScheme.is())
-{
-apOverwritePropertiesMap.reset( new
tPropertyNameValueMap() );
-(*apOverwritePropertiesMap)[FillColor] =
uno::makeAny(
-m_xColorScheme-getColorByIndex( nPointIndex ));
-}
+apOverwritePropertiesMap.reset( new
tPropertyNameValueMap() );
+(*apOverwritePropertiesMap)[FillColor] = uno::makeAny(
+m_xColorScheme-getColorByIndex( nPointIndex ));
}
//create data point
commit 5cc38c1bf60dc851ec908f7a9eac4c6e70e849f7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Aug 15 09:39:19 2014 -0400
Nested conditional !(cond1 cond2 cond3) is harder on human brain.
Change-Id: I1c10c7f0f85607a826ec06ffce12de761af3921a
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 32542d2..1f52415 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -391,8 +391,8 @@ void PieChart::createShapes()
// No series to plot.
return;
-
OSL_ENSURE(m_pShapeFactorym_xLogicTarget.is()m_xFinalTarget.is(),PieChart
is not proper initialized);
-if(!(m_pShapeFactorym_xLogicTarget.is()m_xFinalTarget.is()))
+OSL_ENSURE(m_pShapeFactory m_xLogicTarget.is() m_xFinalTarget.is(),
PieChart is not properly initialized.);
+if (!m_pShapeFactory || !m_xLogicTarget.is() || !m_xFinalTarget.is())
return;
//the text labels should be always on top of the other series shapes
commit 7ecc633bfe4bda3e0647b411ad7d1e6a3357c908
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Aug 15 09:36:42 2014 -0400
Using empty() makes it clearer.
Change-Id: I031f478aab721af0a65762f98bcde3b2473453e6
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index eeaf1c5..32542d2 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -387,7 +387,8 @@ bool
[Libreoffice-commits] core.git: cui/source filter/source include/svx svx/source
cui/source/tabpages/tparea.cxx|4 ++--
cui/source/tabpages/tpshadow.cxx |6 +++---
filter/source/msfilter/msdffimp.cxx |2 +-
include/svx/sdshtitm.hxx | 11 +++
svx/source/sdr/attribute/sdrformtextattribute.cxx |2 +-
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx |2 +-
svx/source/sdr/primitive2d/sdrattributecreator.cxx|2 +-
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdoashp.cxx|2 +-
9 files changed, 14 insertions(+), 19 deletions(-)
New commits:
commit 69dd9c669a4021b5202dad7030bc4738145de661
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 18 17:37:31 2014 +0200
Consistency around SdrPercentItem in svx/sdshtitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: I4e98c362f811c19f03766d0c78f10c795d3ac79d
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 818613d..2177903 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -323,7 +323,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
if(m_pMtrTransparent-IsValueChangedFromSaved() || !bLinearActive)
{
XFillTransparenceItem aItem(nPos);
-SdrShadowTransparenceItem aShadowItem(nPos);
+SdrPercentItem aShadowItem(makeSdrShadowTransparenceItem(nPos));
const SfxPoolItem* pOld = GetOldItem(*rAttrs,
XATTR_FILLTRANSPARENCE);
if(!pOld || !(*(const XFillTransparenceItem*)pOld == aItem) ||
!bLinearActive)
{
@@ -393,7 +393,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
if(bSwitchOffLinear (bLinearActive || bLinearUsed))
{
XFillTransparenceItem aItem(0);
-SdrShadowTransparenceItem aShadowItem(0);
+SdrPercentItem aShadowItem(makeSdrShadowTransparenceItem(0));
rAttrs-Put(aItem);
rAttrs-Put(aShadowItem);
bModified = true;
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 43eeabf..643e80f 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -336,9 +336,9 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent-GetValue();
if( m_pMtrTransparent-IsValueChangedFromSaved() )
{
-SdrShadowTransparenceItem aItem( nVal );
+SdrPercentItem aItem( makeSdrShadowTransparenceItem(nVal) );
pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWTRANSPARENCE );
-if ( !pOld || !( *(const SdrShadowTransparenceItem*)pOld == aItem
) )
+if ( !pOld || !( *(const SdrPercentItem*)pOld == aItem ) )
{
rAttrs-Put( aItem );
bModified = true;
@@ -433,7 +433,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
if( rAttrs-GetItemState( SDRATTR_SHADOWTRANSPARENCE ) !=
SFX_ITEM_DONTCARE )
{
-sal_uInt16 nTransp = ( ( const SdrShadowTransparenceItem )
rAttrs-Get( SDRATTR_SHADOWTRANSPARENCE ) ).GetValue();
+sal_uInt16 nTransp = ( ( const SdrPercentItem ) rAttrs-Get(
SDRATTR_SHADOWTRANSPARENCE ) ).GetValue();
m_pMtrTransparent-SetValue( nTransp );
}
else
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index b6bf96d..22825bc 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2546,7 +2546,7 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
rSet.Put( SdrShadowColorItem( rManager.MSO_CLR_ToColor( 0x00808080,
DFF_Prop_shadowColor ) ) );
}
if ( IsProperty( DFF_Prop_shadowOpacity ) )
-rSet.Put( SdrShadowTransparenceItem( (sal_uInt16)( ( 0x1 -
GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
+rSet.Put( makeSdrShadowTransparenceItem( (sal_uInt16)( ( 0x1 -
GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
if ( IsProperty( DFF_Prop_shadowOffsetX ) )
{
sal_Int32 nVal = static_cast sal_Int32 ( GetPropertyValue(
DFF_Prop_shadowOffsetX ) );
diff --git a/include/svx/sdshtitm.hxx b/include/svx/sdshtitm.hxx
index 607f3bc..e103507 100644
--- a/include/svx/sdshtitm.hxx
+++ b/include/svx/sdshtitm.hxx
@@ -22,14 +22,9 @@
#include svx/sdprcitm.hxx
#include svx/svddef.hxx
-/**
- * class SdrShadowTransparenceItem
- */
-class SdrShadowTransparenceItem: public SdrPercentItem {
-public:
-SdrShadowTransparenceItem(sal_uInt16 nTransp=0):
SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
-SdrShadowTransparenceItem(SvStream rIn) :
[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/source svx/source sw/source
cui/source/tabpages/tpshadow.cxx |6 +++---
filter/source/msfilter/msdffimp.cxx |4 ++--
include/svx/sdshcitm.hxx | 11 +++
sc/source/filter/excel/xiescher.cxx |2 +-
sd/source/core/drawdoc4.cxx |8
sd/source/core/stlpool.cxx|2 +-
svx/source/sdr/attribute/sdrformtextattribute.cxx |2 +-
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx |2 +-
svx/source/sdr/primitive2d/sdrattributecreator.cxx|2 +-
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdoashp.cxx|2 +-
sw/source/filter/ww8/ww8graf.cxx |2 +-
12 files changed, 20 insertions(+), 25 deletions(-)
New commits:
commit 759f5d24b09dda2bcd41274f0b9cd9222180c194
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 18 18:18:08 2014 +0200
Consistency around XColorItem in svx/sdshcitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: I7ecf827a0713efaecb4b0eb49f9f8c06f8c59091
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 643e80f..30b7dc7 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -323,9 +323,9 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
if( nPos != LISTBOX_ENTRY_NOTFOUND
m_pLbShadowColor-IsValueChangedFromSaved() )
{
-SdrShadowColorItem aItem(m_pLbShadowColor-GetSelectEntryColor());
+XColorItem
aItem(makeSdrShadowColorItem(m_pLbShadowColor-GetSelectEntryColor()));
pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWCOLOR );
-if ( !pOld || !( *(const SdrShadowColorItem*)pOld == aItem ) )
+if ( !pOld || !( *(const XColorItem*)pOld == aItem ) )
{
rAttrs-Put( aItem );
bModified = true;
@@ -426,7 +426,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
if( rAttrs-GetItemState( SDRATTR_SHADOWCOLOR ) != SFX_ITEM_DONTCARE )
{
-m_pLbShadowColor-SelectEntry( ( ( const SdrShadowColorItem )
rAttrs-Get( SDRATTR_SHADOWCOLOR ) ).GetColorValue() );
+m_pLbShadowColor-SelectEntry( ( ( const XColorItem )
rAttrs-Get( SDRATTR_SHADOWCOLOR ) ).GetColorValue() );
}
else
m_pLbShadowColor-SetNoSelection();
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 22825bc..4764533 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2539,11 +2539,11 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
if ( IsProperty( DFF_Prop_fillColor ) )
rSet.Put( XFillColorItem( OUString(), rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_fillColor ), DFF_Prop_fillColor ) ) );
if ( IsProperty( DFF_Prop_shadowColor ) )
-rSet.Put( SdrShadowColorItem( rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
+rSet.Put( makeSdrShadowColorItem( rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
else
{
//The default value for this property is 0x00808080
-rSet.Put( SdrShadowColorItem( rManager.MSO_CLR_ToColor( 0x00808080,
DFF_Prop_shadowColor ) ) );
+rSet.Put( makeSdrShadowColorItem( rManager.MSO_CLR_ToColor(
0x00808080, DFF_Prop_shadowColor ) ) );
}
if ( IsProperty( DFF_Prop_shadowOpacity ) )
rSet.Put( makeSdrShadowTransparenceItem( (sal_uInt16)( ( 0x1 -
GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
diff --git a/include/svx/sdshcitm.hxx b/include/svx/sdshcitm.hxx
index 63ea604..01c4741 100644
--- a/include/svx/sdshcitm.hxx
+++ b/include/svx/sdshcitm.hxx
@@ -22,14 +22,9 @@
#include svx/xcolit.hxx
#include svx/svddef.hxx
-class SdrShadowColorItem: public XColorItem
-{
-public:
-SdrShadowColorItem(const Color rTheColor)
-: XColorItem(SDRATTR_SHADOWCOLOR, rTheColor)
-{
-}
-};
+inline XColorItem makeSdrShadowColorItem(const Color rTheColor) {
+return XColorItem(SDRATTR_SHADOWCOLOR, rTheColor);
+}
#endif
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 858c154..c463097 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -771,7 +771,7 @@ void XclImpDrawObjBase::ConvertFrameStyle( SdrObject
rSdrObj, sal_uInt16 nFrame
rSdrObj.SetMergedItem( makeSdrShadowItem( true ) );
rSdrObj.SetMergedItem( makeSdrShadowXDistItem( 35 ) );
rSdrObj.SetMergedItem(
Re: list.cxx in VCL
I have changed my mind, and gone ahead and submitted the patch to Gerrit. I'd be very interested in your and anyone else's feedback regarding the approach. It compiles fine, but I still need to figure out how to test it. I also still have reservations about mixing C++ and C memory allocation. Thanks, Chris -- View this message in context: http://nabble.documentfoundation.org/list-cxx-in-VCL-tp4109073p4119395.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/icu
external/icu/UnpackedTarball_icu.mk |1
external/icu/icu4c-icu11054.patch.1 | 44
2 files changed, 45 insertions(+)
New commits:
commit 1f39f4466f334165d85d1ed8cccf33ff14f91434
Author: Caolán McNamara caol...@redhat.com
Date: Sat Aug 9 21:14:03 2014 +0100
Resolves: icu#11054 crashes in bracketAddOpening
(cherry picked from commit d79d2f0ef7a0e300a3ee4be128c625121d0c4b26)
Conflicts:
external/icu/UnpackedTarball_icu.mk
Change-Id: I5dd63fa41c1568e8bf2d120cc0de5d2c44dd789c
Reviewed-on: https://gerrit.libreoffice.org/10907
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 77cd38a..243b17c 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-mkdir.patch \
external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
+ external/icu/icu4c-icu11054.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11054.patch.1
b/external/icu/icu4c-icu11054.patch.1
new file mode 100644
index 000..48d21f5
--- /dev/null
+++ b/external/icu/icu4c-icu11054.patch.1
@@ -0,0 +1,44 @@
+--- icu/source/common/ubidi.c.orig 2014-08-09 20:54:39.338833533 +0100
icu/source/common/ubidi.c 2014-08-09 20:55:48.625469055 +0100
+@@ -679,10 +679,10 @@
+ bd-isoRuns[0].contextPos=0;
+ if(pBiDi-openingsMemory) {
+ bd-openings=pBiDi-openingsMemory;
+-bd-openingsSize=pBiDi-openingsSize;
++bd-openingsCount=pBiDi-openingsSize / sizeof(Opening);
+ } else {
+ bd-openings=bd-simpleOpenings;
+-bd-openingsSize=SIMPLE_OPENINGS_SIZE;
++bd-openingsCount=SIMPLE_OPENINGS_SIZE;
+ }
+
bd-isNumbersSpecial=bd-pBiDi-reorderingMode==UBIDI_REORDER_NUMBERS_SPECIAL ||
+
bd-pBiDi-reorderingMode==UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL;
+@@ -743,7 +743,7 @@
+ bracketAddOpening(BracketData *bd, UChar match, int32_t position) {
+ IsoRun *pLastIsoRun=bd-isoRuns[bd-isoRunLast];
+ Opening *pOpening;
+-if(pLastIsoRun-limit=bd-openingsSize) { /* no available new entry */
++if(pLastIsoRun-limit=bd-openingsCount) { /* no available new entry */
+ UBiDi *pBiDi=bd-pBiDi;
+ if(!getInitialOpeningsMemory(pBiDi, pLastIsoRun-limit * 2))
+ return FALSE;
+@@ -751,7 +751,7 @@
+ uprv_memcpy(pBiDi-openingsMemory, bd-simpleOpenings,
+ SIMPLE_OPENINGS_SIZE * sizeof(Opening));
+ bd-openings=pBiDi-openingsMemory; /* may have changed */
+-bd-openingsSize=pBiDi-openingsSize;
++bd-openingsCount=pBiDi-openingsSize / sizeof(Opening);
+ }
+ pOpening=bd-openings[pLastIsoRun-limit];
+ pOpening-position=position;
+--- icu/source/common/ubidiimp.h.orig 2014-08-09 20:55:15.053161192 +0100
icu/source/common/ubidiimp.h 2014-08-09 20:56:07.028637725 +0100
+@@ -173,7 +173,7 @@
+ /* array of opening entries which should be enough in most cases; no
malloc() */
+ Opening simpleOpenings[SIMPLE_OPENINGS_SIZE];
+ Opening *openings; /* pointer to current array of
entries */
+-int32_t openingsSize; /* number of allocated entries */
++int32_t openingsCount; /* number of allocated entries */
+ int32_t isoRunLast; /* index of last used entry */
+ /* array of nested isolated sequence entries; can never excess
UBIDI_MAX_EXPLICIT_LEVEL
++ 1 for index 0, + 1 for before the first isolated sequence */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/LifeTime.hxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit b4454c19c424d50b75fff8ef2965c5cf379c8558
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 18 18:38:23 2014 +0200
Generally better to have DLLPUBLIC class with some DLLPRIVATE members
...in the same vein as 80a1a2599e04142683d2286d0e32d0e13fb45de3.
Change-Id: I181d54475d82e2a01a56f48a13ac42dbad876d2c
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 1fd93e8..edcdcab 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -33,29 +33,29 @@ namespace apphelper
{
class LifeTimeGuard;
-class LifeTimeManager
+class OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager
{
friend class LifeTimeGuard;
protected:
mutable ::osl::Mutexm_aAccessMutex;
public:
-OOO_DLLPUBLIC_CHARTTOOLSLifeTimeManager(
::com::sun::star::lang::XComponent* pComponent, bool
bLongLastingCallsCancelable = false );
-OOO_DLLPUBLIC_CHARTTOOLSvirtual ~LifeTimeManager();
+LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, bool
bLongLastingCallsCancelable = false );
+virtual ~LifeTimeManager();
-OOO_DLLPUBLIC_CHARTTOOLSboolimpl_isDisposed( bool bAssert=true );
-OOO_DLLPUBLIC_CHARTTOOLSbooldispose()
throw(::com::sun::star::uno::RuntimeException);
+boolimpl_isDisposed( bool bAssert=true );
+booldispose() throw(::com::sun::star::uno::RuntimeException);
public:
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer;
protected:
-virtual boolimpl_canStartApiCall();
-virtual voidimpl_apiCallCountReachedNull(){}
+SAL_DLLPRIVATE virtual boolimpl_canStartApiCall();
+SAL_DLLPRIVATE virtual voidimpl_apiCallCountReachedNull(){}
-voidimpl_registerApiCall(bool bLongLastingCall);
-voidimpl_unregisterApiCall(bool bLongLastingCall);
+SAL_DLLPRIVATE voidimpl_registerApiCall(bool bLongLastingCall);
+SAL_DLLPRIVATE voidimpl_unregisterApiCall(bool bLongLastingCall);
-voidimpl_init();
+SAL_DLLPRIVATE voidimpl_init();
protected:
::com::sun::star::lang::XComponent* m_pComponent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - avmedia/source external/libgltf
avmedia/source/opengl/oglplayer.cxx | 13 --
external/libgltf/UnpackedTarball_libgltf.mk |1
external/libgltf/pathces/append_shader_version.patch | 37 +++
3 files changed, 39 insertions(+), 12 deletions(-)
New commits:
commit cf2afb05dd571bd85d75385a8254454da99951ee
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Aug 18 09:31:06 2014 +0200
libgltf: Append shader language version to the shader files
In general glTF shader files does not contain version
directives and in some case it make shader compiler
using GLSL 1.1 which leads to that the shader compiler
fails.
So we need to append the choosen version number which is
GLSL 1.3 in case of libgltf, but this also means that
from that point OpenGL 3.0 is the new reuirements since
GLSL 1.3 is available only from that version.
(cherry picked from commit c67026f27023008d124c8ab76533169f032b04f6)
Conflicts:
external/libgltf/UnpackedTarball_libgltf.mk
Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280
Reviewed-on: https://gerrit.libreoffice.org/10948
Reviewed-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index ba7e9f2..a052dc9 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -241,18 +241,7 @@ awt::Size SAL_CALL
OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::Runtim
static bool lcl_CheckOpenGLRequirements()
{
-float fVersion = OpenGLHelper::getGLVersion();
-
-if( fVersion = 3.0 )
-{
-return true;
-}
-else if( fVersion = 2.1 )
-{
-return glewIsSupported(GL_ARB_framebuffer_object
GL_ARB_vertex_array_object);
-}
-
-return false;
+return OpenGLHelper::getGLVersion() = 3.0;
}
uno::Reference media::XPlayerWindow SAL_CALL OGLPlayer::createPlayerWindow(
const uno::Sequence uno::Any rArguments )
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index 3b27c2a..42c821b 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/pathces/missing_include.patch \
+ external/libgltf/pathces/append_shader_version.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/pathces/append_shader_version.patch
b/external/libgltf/pathces/append_shader_version.patch
new file mode 100644
index 000..27f0cc6
--- /dev/null
+++ b/external/libgltf/pathces/append_shader_version.patch
@@ -0,0 +1,37 @@
+diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+--- libgltf.org/src/Shaders.cpp2014-08-18 09:19:48.323955939 +0200
libgltf/src/Shaders.cpp2014-08-18 09:20:46.711953465 +0200
+@@ -11,6 +11,7 @@
+
+ #include GL/glew.h
+ #include cstdio
++#include cstring
+
+ namespace libgltf
+ {
+@@ -166,7 +167,24 @@
+ unsigned int shaderId)
+ {
+ GLint iGLSize = iSize;
+-glShaderSource(shaderId, 1, pShader, iGLSize);
++if( strstr(pShader,#version) == 0 )
++{
++const GLchar* aSources[] = {
++#version 130\n,
++pShader,
++};
++
++const GLint aSizes[] = {
++strlen(#version 130\n),
++iGLSize,
++};
++
++glShaderSource(shaderId, 2, aSources[0], aSizes[0]);
++}
++else
++{
++glShaderSource(shaderId, 1, pShader, iGLSize);
++}
+ glCompileShader(shaderId);
+ int iStatus = 0;
+ glGetShaderiv(shaderId, GL_COMPILE_STATUS, iStatus);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa
sw/qa/extras/ww8import/ww8import.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 26dd67e6e8809077e2e2bc0e7b291b44abed36e0
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Aug 18 16:09:23 2014 +0200
misplaced test from 5a454e5ed3f1: should be Linux only
Change-Id: I32df6241f9b1259f1b563826a0d0b8e468ecf4bc
Reviewed-on: https://gerrit.libreoffice.org/10997
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 1e99ab8..7b06c86 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -334,14 +334,14 @@ DECLARE_WW8IMPORT_TEST(testFdp80333, fdo80333.doc)
CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_NONE, aShadow.Location);
}
-#endif
-
DECLARE_WW8IMPORT_TEST(testBnc787942, bnc787942.doc)
{
// The frame ended up on the second page instead of first.
parseDump(/root/page[1]/body/txt[4]/anchored);
}
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
|binary
writerfilter/source/rtftok/rtfdocumentimpl.cxx
|4
2 files changed, 4 insertions(+)
New commits:
commit d2e69f454a30e64acb04f88a5d753169dbfc5259
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 17 22:32:52 2014 +0100
check for empty m_aStates
valgrind + bff
Change-Id: Ib818d508e10877a845b733c4aa223d1e2cbbc05e
(cherry picked from commit e2b9531e43d37677109aa13eb6e2ebf857961016)
Reviewed-on: https://gerrit.libreoffice.org/10958
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
new file mode 100644
index 000..0925203
Binary files /dev/null and
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 37afecc..94e518a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -467,6 +467,10 @@ void RTFDocumentImpl::checkNeedPap()
if (m_bNeedPap)
{
m_bNeedPap = false; // reset early, so we can avoid recursion when
calling ourselves
+
+if (m_aStates.empty())
+return;
+
if (!m_aStates.top().pCurrentBuffer)
{
writerfilter::ReferenceProperties::Pointer_t const
pParagraphProperties(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
|binary
writerfilter/source/rtftok/rtfdocumentimpl.cxx
|4
2 files changed, 4 insertions(+)
New commits:
commit 33f2265a297a51d1b341f583951d8ed46f9155e7
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 17 22:32:52 2014 +0100
check for empty m_aStates
valgrind + bff
Change-Id: Ib818d508e10877a845b733c4aa223d1e2cbbc05e
(cherry picked from commit e2b9531e43d37677109aa13eb6e2ebf857961016)
Reviewed-on: https://gerrit.libreoffice.org/10959
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
new file mode 100644
index 000..0925203
Binary files /dev/null and
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9a711d8..ca34825 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -457,6 +457,10 @@ void RTFDocumentImpl::checkNeedPap()
if (m_bNeedPap)
{
m_bNeedPap = false; // reset early, so we can avoid recursion when
calling ourselves
+
+if (m_aStates.empty())
+return;
+
if (!m_aStates.top().pCurrentBuffer)
{
writerfilter::ReferenceProperties::Pointer_t const
pParagraphProperties(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - cui/source svl/source
cui/source/tabpages/numfmt.cxx | 18 ++---
svl/source/numbers/zformat.cxx | 56 +++--
2 files changed, 47 insertions(+), 27 deletions(-)
New commits:
commit f3e7a49e2c7ea235b724c157f8d05a23c675913a
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 14:09:20 2014 +0200
prevent out-of-bounds string access
... while entering a * star symbol format code and there's no fill
character following the * yet, for example xxx*
(cherry picked from commit 839cc63e7d1b78c56e04bafb46037e898ce2c455)
more out-of-bounds string accesses
(cherry picked from commit 349c93e0f5c9f231b2ff6854fcb795ca5881ca2d)
Change-Id: I006f125ceefccba6a95ea033fd434d98e5d4f1c2
Reviewed-on: https://gerrit.libreoffice.org/10994
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 52d2356..d4af55c 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -112,9 +112,21 @@ void SvxNumberPreview::NotifyChange( const OUString
rPrevStr,
mnPos = aPrevStr.indexOf( 0x1B );
if ( mnPos != -1 )
{
-mnChar = aPrevStr[ mnPos + 1 ];
-// delete placeholder and char to repeat
-aPrevStr = aPrevStr.replaceAt( mnPos, 2, );
+// Right during user input the star symbol is the very
+// last character before the user enters another one.
+if (mnPos aPrevStr.getLength() - 1)
+{
+mnChar = aPrevStr[ mnPos + 1 ];
+// delete placeholder and char to repeat
+aPrevStr = aPrevStr.replaceAt( mnPos, 2, );
+}
+else
+{
+// delete placeholder
+aPrevStr = aPrevStr.replaceAt( mnPos, 1, );
+// do not attempt to draw a 0 fill character
+mnPos = -1;
+}
}
svtools::ColorConfig aColorConfig;
Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR
).nColor );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index ef94a23..a48c029 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2241,6 +2241,30 @@ short SvNumberformat::ImpCheckCondition(double fNumber,
}
}
+static bool lcl_appendStarFillChar( OUStringBuffer rBuf, const OUString rStr
)
+{
+// Right during user input the star symbol is the very
+// last character before the user enters another one.
+if (rStr.getLength() 1)
+{
+rBuf.append((sal_Unicode) 0x1B);
+rBuf.append(rStr[1]);
+return true;
+}
+return false;
+}
+
+static bool lcl_insertStarFillChar( OUStringBuffer rBuf, sal_Int32 nPos,
const OUString rStr )
+{
+if (rStr.getLength() 1)
+{
+rBuf.insert( nPos, rStr[1]);
+rBuf.insert( nPos, (sal_Unicode) 0x1B);
+return true;
+}
+return false;
+}
+
bool SvNumberformat::GetOutputString(const OUString sString,
OUString OutString,
Color** ppColor)
@@ -2273,9 +2297,7 @@ bool SvNumberformat::GetOutputString(const OUString
sString,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sOutBuff.append((sal_Unicode) 0x1B);
-sOutBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sOutBuff,
rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -2588,9 +2610,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff,
rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -3214,9 +3234,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode)0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff, rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -3712,9 +3730,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff, rInfo.sStrArray[i]);
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source svl/source
cui/source/tabpages/numfmt.cxx | 18 ++---
svl/source/numbers/zformat.cxx | 56 +++--
2 files changed, 47 insertions(+), 27 deletions(-)
New commits:
commit 289bd546cff718d76ca77c049e9ff68b15a047e5
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 14:09:20 2014 +0200
prevent out-of-bounds string access
... while entering a * star symbol format code and there's no fill
character following the * yet, for example xxx*
(cherry picked from commit 839cc63e7d1b78c56e04bafb46037e898ce2c455)
more out-of-bounds string accesses
(cherry picked from commit 349c93e0f5c9f231b2ff6854fcb795ca5881ca2d)
Change-Id: I006f125ceefccba6a95ea033fd434d98e5d4f1c2
Reviewed-on: https://gerrit.libreoffice.org/10995
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 5552c3a..c877951 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -110,9 +110,21 @@ void SvxNumberPreview::NotifyChange( const OUString
rPrevStr,
mnPos = aPrevStr.indexOf( 0x1B );
if ( mnPos != -1 )
{
-mnChar = aPrevStr[ mnPos + 1 ];
-// delete placeholder and char to repeat
-aPrevStr = aPrevStr.replaceAt( mnPos, 2, );
+// Right during user input the star symbol is the very
+// last character before the user enters another one.
+if (mnPos aPrevStr.getLength() - 1)
+{
+mnChar = aPrevStr[ mnPos + 1 ];
+// delete placeholder and char to repeat
+aPrevStr = aPrevStr.replaceAt( mnPos, 2, );
+}
+else
+{
+// delete placeholder
+aPrevStr = aPrevStr.replaceAt( mnPos, 1, );
+// do not attempt to draw a 0 fill character
+mnPos = -1;
+}
}
svtools::ColorConfig aColorConfig;
Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR
).nColor );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 576da59..de6dffd 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2230,6 +2230,30 @@ short SvNumberformat::ImpCheckCondition(double fNumber,
}
}
+static bool lcl_appendStarFillChar( OUStringBuffer rBuf, const OUString rStr
)
+{
+// Right during user input the star symbol is the very
+// last character before the user enters another one.
+if (rStr.getLength() 1)
+{
+rBuf.append((sal_Unicode) 0x1B);
+rBuf.append(rStr[1]);
+return true;
+}
+return false;
+}
+
+static bool lcl_insertStarFillChar( OUStringBuffer rBuf, sal_Int32 nPos,
const OUString rStr )
+{
+if (rStr.getLength() 1)
+{
+rBuf.insert( nPos, rStr[1]);
+rBuf.insert( nPos, (sal_Unicode) 0x1B);
+return true;
+}
+return false;
+}
+
bool SvNumberformat::GetOutputString(const OUString sString,
OUString OutString,
Color** ppColor)
@@ -2262,9 +2286,7 @@ bool SvNumberformat::GetOutputString(const OUString
sString,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sOutBuff.append((sal_Unicode) 0x1B);
-sOutBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sOutBuff,
rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -2577,9 +2599,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff,
rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -3203,9 +3223,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode)0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff, rInfo.sStrArray[i]);
}
break;
case NF_SYMBOLTYPE_BLANK:
@@ -3701,9 +3719,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
-sBuff.append((sal_Unicode) 0x1B);
-sBuff.append(rInfo.sStrArray[i][1]);
-bRes = true;
+bRes = lcl_appendStarFillChar( sBuff, rInfo.sStrArray[i]);
[Bug 44580] share autocorrect replacement table for misc. language subgroups
https://bugs.freedesktop.org/show_bug.cgi?id=44580 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||tima...@gmail.com --- Comment #10 from Julien Nabet serval2...@yahoo.fr --- Tommy27: I imagined generic language files more like a base for standard or use dictionaries not as a generic dictionary per se. However, I'm not i18n expert at all and let Andras speak. For example, I put a selection in en-US and another in fr-FR then I added 1 word for each. I found the result in wordbook/standard.dic (from a brand new profile with master sources updated some days ago): OOoUserDict1 lang: none type: positive --- stiro stari Is it ok or not, I don't know (I hadn't made this test before). Andras: put you in cc of this one because I'm not sure what we should do now. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/frmedt/feshview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5d5c102e36bcc7eac6ae89d44a635e5d9b680e40
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Mon Aug 18 20:18:40 2014 +0200
Typo: loop on all Marks instead of processing Mark(0) over and over
See:
http://nabble.documentfoundation.org/Suspicious-loop-any-idea-td4119239.html
Since the code was like this since initial import (2000), if this patch
proves
to be wrong then the other option could be to just don't loop and process
Mark(0) just once.
Change-Id: I41ac18604e916740dcc68bf69af37529842f774d
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 49dd779..97c064c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -731,7 +731,7 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
bool bCheckNeighbours = false;
sal_Int16 aHori = text::HoriOrientation::NONE;
SwRect aRect;
-SdrObject *pO = pLst-GetMark( 0 )-GetMarkedSdrObj();
+SdrObject *pO = pLst-GetMark( j )-GetMarkedSdrObj();
if ( pO-ISA(SwVirtFlyDrawObj) )
{
SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)-GetFlyFrm();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Suspicious loop: any idea?
Hi Michael, all
On 08/18/2014 12:37 PM, Michael Stahl wrote:
On 16/08/14 22:42, Matteo Casalin wrote:
Hi all,
function lcl_NotifyNeighbours in sw/source/core/frmedt/feshview.cxx
has the following loop:
for( size_t j = 0; j pLst-GetMarkCount(); ++j )
{
[...]
SdrObject *pO = pLst-GetMark( 0 )-GetMarkedSdrObj();
[...]
}
I can't see any use of j inside the loop itself, and repeatedly calling
GetMark( 0 ) seems a little strange to me since I do not see any
removal of the obtained Mark (which could explain the loop). I'm not
familiar with this code, though: does anybody have an idea of whether
the loop is correct or not, and in case of how to fix it?
i think you're right, it's very suspicious and the 0 should be replaced
by j. probably the feature is obscure enough that it doesn't cause
easily noticeable problems; you have to select more than 1 fly and then
invoke some send-to-top or send-to-bottom feature.
Pushed replacement of 0 with j as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5d5c102e36bcc7eac6ae89d44a635e5d9b680e40
Thanks everybody for your comments
Matteo
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Suspicious loop: any idea?
Thanks Julien for providing much more accessible and clear context! Cheers Matteo On 08/17/2014 09:02 AM, julien2412 wrote: Just to check more quickly, here's the link: http://opengrok.libreoffice.org/xref/core/sw/source/core/frmedt/feshview.cxx#720 I agree with you, this part is strange: SdrObject *pO = pLst-GetMark( 0 )-GetMarkedSdrObj(); Shouldn't it be this? SdrObject *pO = pLst-GetMark( j )-GetMarkedSdrObj(); Julien -- View this message in context: http://nabble.documentfoundation.org/Suspicious-loop-any-idea-tp4119239p4119258.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/DateConversion.cxx | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 5eaa0e76fb59ed7699c12b84a6d9c052fec3c128
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Aug 18 20:38:43 2014 +0200
fdo#82757 call convertStringToNumber and detectNumberFormat with same locale
So that they agree (among others) on date recognition patterns.
Change-Id: I964142702b5bb23bca2c62433e52f76dfa4bdacb
diff --git a/connectivity/source/commontools/DateConversion.cxx
b/connectivity/source/commontools/DateConversion.cxx
index 5371c43..954e987 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -250,7 +250,21 @@ void DBTypeConversion::setValue(const
ReferenceXColumnUpdate xVariant,
try
{
double fValue = xFormatter-convertStringToNumber(nKeyToUse,
rString);
-sal_Int32 nRealUsedKey = xFormatter-detectNumberFormat(0,
rString);
+Reference XNumberFormats
xFormats(xFormatter-getNumberFormatsSupplier()-getNumberFormats());
+Reference XNumberFormatTypes xFormatTypes(xFormats, UNO_QUERY);
+assert(xFormatTypes.is());
+sal_Int32 nStandardKey(0);
+if(xFormatTypes.is())
+{
+css::lang::Locale loc;
+
OSL_VERIFY(xFormats-getByKey(nKeyToUse)-getPropertyValue(Locale) = loc);
+nStandardKey = xFormatTypes-getStandardIndex(loc);
+}
+// Why use nStandardKey rather than nKeyToUse here? Don't know,
but it was always like that.
+// Previously had hardcoded 0 instead of nStandardKey, which led
to problems with dates
+// because of differences M/D/Y vs D/M/Y. This at least fixes
those problems, but possibly
+// nKeyToUse is an even better choice than nStandardKey.
+sal_Int32 nRealUsedKey =
xFormatter-detectNumberFormat(nStandardKey, rString);
if (nRealUsedKey != nKeyToUse)
nRealUsedTypeClass = getNumberFormatType(xFormatter,
nRealUsedKey) ~NumberFormat::DEFINED;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/subsequent_export-test.cxx | 18 ++
sc/source/filter/excel/excrecds.cxx |5 +++--
2 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 3104f95254530c76c3fc0c3b840254912c067ad8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Aug 18 15:16:19 2014 -0400
Let's not export sheet tab color when it's not set.
COL_AUTO is the default value which is treated as color not being set. The
old code would export it as a white color which is not correct.
Change-Id: Ib68fccfb228333f2059edc4cfffeed90880ebc60
diff --git a/sc/source/filter/excel/excrecds.cxx
b/sc/source/filter/excel/excrecds.cxx
index 0ea43ff..d911c19 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -424,8 +424,9 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream rStrm )
// OOXTODO: XML_outlinePr
-rWorksheet-singleElement(
-XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(),
FSEND);
+if (maTabColor != Color(COL_AUTO))
+rWorksheet-singleElement(
+XML_tabColor, XML_rgb,
XclXmlUtils::ToOString(maTabColor).getStr(), FSEND);
rWorksheet-singleElement(XML_pageSetUpPr,
// OOXTODO: XML_autoPageBreaks,
commit ead1db7d4907ff70d412701f08b9c74481cef0bc
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Aug 18 15:15:03 2014 -0400
Write test to ensure that we export sheet tab color settings correctly.
Previously, we would incorrectly export a sheet tab without any color set
as a tab with white color.
Change-Id: I97e59a0d8e2fba6db64149f53acfe4331a5ce2ba
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 466ca67..8d9a67a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -1757,6 +1757,24 @@ void ScExportTest::testSharedFormulaExportXLSX()
{
bool checkContent( ScDocument rDoc )
{
+SCTAB nTabCount = rDoc.GetTableCount();
+if (nTabCount != 2)
+{
+cerr Document should have exactly 2 sheets.
nTabCount found. endl;
+return false;
+}
+
+// Make sure the sheet tab colors are not set.
+for (SCROW i = 0; i = 1; ++i)
+{
+Color aTabBgColor = rDoc.GetTabBgColor(i);
+if (aTabBgColor != Color(COL_AUTO))
+{
+cerr The tab color of Sheet (i+1) should not
be explicitly set. endl;
+return false;
+}
+}
+
// B2:B7 should show 1,2,3,4,5,6.
double fExpected = 1.0;
for (SCROW i = 1; i = 6; ++i, ++fExpected)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/ios
vcl/ios/iosinst.cxx |8
1 file changed, 8 deletions(-)
New commits:
commit d08a81d67826d780b626a5a6faad3de7179576bc
Author: Tor Lillqvist t...@collabora.com
Date: Mon Aug 18 22:28:44 2014 +0300
Bin temporary code that doesn't compile any longer
Change-Id: I7550a40bab4ffd1b585ad37dceb59c38cf1e4ca3
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 61cc1b1..f2df460 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -234,14 +234,6 @@ int IosSalSystem::ShowNativeDialog( const OUString rTitle,
NSLog(@%@: %@, CreateNSString(rTitle), CreateNSString(rMessage));
-if (IosSalInstance::getInstance() != NULL)
-{
-// Temporary...
-MessageDialog aVclErrBox(NULL, rMessage);
-aVclErrBox.SetTitle(rTitle);
-aVclErrBox.Execute();
-}
-
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44580] share autocorrect replacement table for misc. language subgroups
https://bugs.freedesktop.org/show_bug.cgi?id=44580 --- Comment #11 from tommy27 ba...@quipo.it --- Sorry but I do Not understand what You are talking about these are list for automatic correction of typing errors not dictionariesSee The yellow example in the original description -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/items/numfmtsh.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 6ef56dacbab92fac1e2fb79492cbd8b2dd6d92ed
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 22:08:59 2014 +0200
remove cruft
Change-Id: Id5ba28d7862590e11cca24fc8e25ca68fae1d5a8
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 80b9255..c5876b4 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -516,9 +516,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16
nCatLbPos,
// Vorbedingung: Zahlenformatierer gefunden
DBG_ASSERT( pFormatter != NULL, Zahlenformatierer nicht gefunden! );
-// sal_uInt16 nCount = 0;
short nSelPos = SELPOS_NONE;
-// SvNumberFormatTable*pFmtTable = NULL;
// Sonderbehandlung fuer undefiniertes Zahlenformat:
if ( (eValType == SVX_VALUE_TYPE_UNDEFINED) (nCurFormatKey == 0) )
@@ -640,7 +638,6 @@ void SvxNumberFormatShell::FillEListWithStd_Impl(
std::vectorOUString rList,
if(nPrivCat==CAT_DATE || nPrivCat==CAT_TIME)
{
nSelPos=FillEListWithDateTime_Impl(rList,nSelPos);
-//if(nSelPos!=SELPOS_NONE) nSelPos=nTmpPos;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44580] share autocorrect replacement table for misc. language subgroups
https://bugs.freedesktop.org/show_bug.cgi?id=44580 --- Comment #12 from Julien Nabet serval2...@yahoo.fr --- Oups forget what I told, of course you're right :-) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/factoryimpl.py |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a3a5d4fcdc66e20e0aa1addb12cbd5e0f133012e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 18 21:36:46 2014 +0200
writerfilter: sort namespaces in OOXMLStreamImpl::getFastParser()
The motivation is that namespace-alias elements in model.xml are
redundant, as the same info is available from oox as well. But without
sorting, it's impossible to generate the same output, as the (not
interesting) order isn't the same there.
Change-Id: I634c62e43d1b54100bfa623c6f4334279fb1
diff --git a/writerfilter/source/ooxml/factoryimpl.py
b/writerfilter/source/ooxml/factoryimpl.py
index 33c7623..a2af9c8e1 100644
--- a/writerfilter/source/ooxml/factoryimpl.py
+++ b/writerfilter/source/ooxml/factoryimpl.py
@@ -126,7 +126,7 @@ std::string fastTokenToId(sal_uInt32 nToken)
{)
aliases = []
-for alias in [a.getAttribute(alias) for a in
model.getElementsByTagName(namespace-alias)]:
+for alias in sorted([a.getAttribute(alias) for a in
model.getElementsByTagName(namespace-alias)]):
if not alias in aliases:
aliases.append(alias)
print(case oox::NMSP_%s:
@@ -160,8 +160,11 @@ def getFastParser(model):
{
mxFastParser = css::xml::sax::FastParser::create(mxContext);
)
+aliases = {}
for alias in model.getElementsByTagName(namespace-alias):
-print(mxFastParser-registerNamespace(%s,
oox::NMSP_%s); % (alias.getAttribute(name), alias.getAttribute(alias)))
+aliases[alias.getAttribute(name)] = alias.getAttribute(alias)
+for name in sorted(aliases.keys()):
+print(mxFastParser-registerNamespace(%s,
oox::NMSP_%s); % (name, aliases[name]))
print(}
return mxFastParser;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/parse/sqlbison.y |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3dd12b4a5c476eac74b4de15f97e0177cde81e1f
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Aug 18 22:22:22 2014 +0200
fdo#82427 disambiguate NOT LIKE 'foo'
Change-Id: Iab383639ea73cc87c03f4f42433bc9ccfcd988ef
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 790f27e..5d2e183 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1124,8 +1124,8 @@ parenthesized_boolean_value_expression:
}
;
boolean_factor:
- boolean_primary
- | SQL_TOKEN_NOT boolean_primary
+ boolean_primary %dprec 2
+ | SQL_TOKEN_NOT boolean_primary %dprec 1
{ // boolean_factor: rule 1
$$ = SQL_NEW_RULE;
$$-append($1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LO 4.3.2.0.0+ build fails on RTF cppunit tests (seg. fault)
Hi, On Ubuntu 14.04 x86-64 building 4.3 branch fails by segmentation fault in RTF cppunit tests. It seems that the problem comes from this commit : https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d2e69f454a30e64acb04f88a5d753169dbfc5259 My previous build without problem was at commit https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=a501f64beb4e37330764a2f5c091685f2ca9359f Last message in the console: [build CUT] writerfilter_rtftok File tested,Test Result,Execution Time (ms) file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf,Pass,26 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/rhbz960019.rtf,Pass,0 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf,Pass,19 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf,Pass,42 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf,Pass,0 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010--1.rtf,Pass,0 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/fdo49666.rtf,Pass,0 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf,Pass,1 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf,Pass,0 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf,Pass,1 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf,Pass,2 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf,Pass,1 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf,Pass,1 file:///home/.../LibO/lo43/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf,Segmentation fault Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44580] share autocorrect replacement table for misc. language subgroups
https://bugs.freedesktop.org/show_bug.cgi?id=44580 --- Comment #13 from Julien Nabet serval2...@yahoo.fr --- (sorry again for my previous comment, I was focus on dictionaries) A second issue about editing generic unlocalized autocorrect list is what to do with localized ones (if they've been generated) once the unlocalized autocorrect list is changed? Should we try to spread the change in localized autocorrect lists? If yes, what to do if there's a conflict? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#58189 : EDITING: Wrong Chapter Moves with the Navigator
I think the reason for fdo58189 is that the lcl_GetOutlineKey-function
checks the position against 0 whereas the key-finding lines in ::Collapse
and ::Expand (for example lines 1459 or 1479 in content.cxx) dont.
Ulrich
From c08340403e551499fc4282d28805af5b2ae384d2 Mon Sep 17 00:00:00 2001
From: Ulrich Kitzinger ulrich.kitzin...@hotmail.de
Date: Mon, 18 Aug 2014 23:01:05 +0200
Subject: [PATCH] fdo#58189: Wrong DnD move to first node
During DnD, the target of the dropped node is wrong when dropping after the first node. That's because no key is calculated for position 0 (= t
he first node).
Change-Id: I5141efbffb690b940c73887c208400545470a36e
---
sw/source/uibase/utlui/content.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index eb2889c..aef2970 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1078,10 +1078,9 @@ static void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent
{
SwWrtShell* pShell = pTree-GetWrtShell();
sal_Int32 nPos = pContent-GetYPos();
-if( nPos )
-{
-key = (void*)pShell-getIDocumentOutlineNodesAccess()-getOutlineNode( nPos );
-}
+
+key = (void*)pShell-getIDocumentOutlineNodesAccess()-getOutlineNode( nPos );
+
}
return key;
}
--
1.7.9.5
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44580] share autocorrect replacement table for misc. language subgroups
https://bugs.freedesktop.org/show_bug.cgi?id=44580 --- Comment #14 from tommy27 ba...@quipo.it --- Unlocalized file should have its own list and should not mix with localized file the reason was explained here (In reply to comment #0) ... there are also separate replacement tables for all language variants: however those .dat files are not mutual... this separate subtype policy must be kept because of the minority of words that have different spelling among language variants For example i could set a: - “colour - color” entry in the acor-en_US.dat file and a - “color - colour” entry in the acor-en_GB.dat file there's however the vast majority of words that have exactly the same spelling... let's take an example: “yellow” which is the same in England, USA, South Africa, Australia, Canada etc. etc. if you come with a typing error like “yrllow” you should set an autocorrect entry in each of the localized english .dat files... it would be too time consuming... It would be much user friendly and time saving to have a “non localized” acor-en.dat file whose entries are shared by all english subtypes. it would be great to have something similar to the the “universal replacement table” acor_.dat but restricted to certain language groups. something like: - acor_en.dat working on both UK, US, AUS etc. ect. english variants - acor_it.dat working both on italian and swiss language -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44580] share autocorrect replacement table for misc. language subgroups
https://bugs.freedesktop.org/show_bug.cgi?id=44580 --- Comment #15 from Julien Nabet serval2...@yahoo.fr --- Tommy27: Just to be sure to understand, it would mean: - a first file for initial unlocalized file - a second file for unlocalized autocorrect if you edit the unlocalized list - a third file for your localized autocorrect if you edit localized list = So autocorrect process should search in second and third file first (in which order? A user could have made a mistake and put a same word to replace but a different replacement) and if there's none of these files, should search in first file only Is it correct? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Context Menu - Writer
Thank you guys! 2014-08-16 9:02 GMT-03:00 Tomaž Vajngerl qui...@gmail.com: Hi, On Sat, Aug 16, 2014 at 12:16 AM, Marcos Souza marcoo...@gmail.com wrote: Hello guys, I'm trying to contribute to LibreOffice. But I can not find the piece of code that refers to the 'context menu' in writer module. I would like to do what suggests Bug 62947 in bugzilla. Could anyone help me with this? I really want to contribute but can not find me in the code. I already have the code on my computer. Thank you. PS: Sorry for my English. I gave some code pointers as comment in the bug. Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: scripts/Bugzilla.pm
scripts/Bugzilla.pm |1 + 1 file changed, 1 insertion(+) New commits: commit 1f6a7b49d7b5b4fad773fbd0255c6759170fd2fb Author: Michael Meeks michael.me...@collabora.com Date: Tue Aug 19 06:28:18 2014 +0100 more blacklisting. diff --git a/scripts/Bugzilla.pm b/scripts/Bugzilla.pm index 7cfc1f7..31030d2 100644 --- a/scripts/Bugzilla.pm +++ b/scripts/Bugzilla.pm @@ -60,6 +60,7 @@ my %sadly_non_libreoffice = ( 'Andreas Boll' = 1, 'Tapani Pälli' = 1, 'Matt Turner' = 1, +'Michel Dänzer' = 1, ); sub get_url($) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/WINNetworkService.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 8957c9419af8a1bc56b7e6cb248dc3fd57708589
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 19 07:32:26 2014 +0200
error C2296: '' : illegal, left operand has type 'const char [28]'
Change-Id: Ibc25771002bd8ac9b4a2aca9f3c2965b8da9014e
diff --git a/sd/source/ui/remotecontrol/WINNetworkService.cxx
b/sd/source/ui/remotecontrol/WINNetworkService.cxx
index 8f6885e..3643e1d 100644
--- a/sd/source/ui/remotecontrol/WINNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/WINNetworkService.cxx
@@ -2,6 +2,7 @@
#include iostream
#include WINNetworkService.hxx
#include mDNSResponder/dns_sd.h
+#include sal/log.hxx
void sd::WINNetworkService::setup()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/excel/excrecds.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 171a47faaced1ac556ab9193546d6c543a709fe6 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Aug 18 15:16:19 2014 -0400 Let's not export sheet tab color when it's not set. COL_AUTO is the default value which is treated as color not being set. The old code would export it as a white color which is not correct. Change-Id: Ib68fccfb228333f2059edc4cfffeed90880ebc60 (cherry picked from commit 3104f95254530c76c3fc0c3b840254912c067ad8) Reviewed-on: https://gerrit.libreoffice.org/11004 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 36a3254..b5ede00 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -449,8 +449,9 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream rStrm ) // OOXTODO: XML_outlinePr -rWorksheet-singleElement( -XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(), FSEND); +if (maTabColor != Color(COL_AUTO)) +rWorksheet-singleElement( +XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(), FSEND); rWorksheet-singleElement(XML_pageSetUpPr, // OOXTODO: XML_autoPageBreaks, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/excel/excrecds.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 9cc0baaea4ec20dda6996b74a64a12f4094eee5c Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Aug 18 15:16:19 2014 -0400 Let's not export sheet tab color when it's not set. COL_AUTO is the default value which is treated as color not being set. The old code would export it as a white color which is not correct. Change-Id: Ib68fccfb228333f2059edc4cfffeed90880ebc60 (cherry picked from commit 3104f95254530c76c3fc0c3b840254912c067ad8) Reviewed-on: https://gerrit.libreoffice.org/11005 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 847e61d..7d8ac31 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -471,8 +471,9 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream rStrm ) // OOXTODO: XML_outlinePr -rWorksheet-singleElement( -XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(), FSEND); +if (maTabColor != Color(COL_AUTO)) +rWorksheet-singleElement( +XML_tabColor, XML_rgb, XclXmlUtils::ToOString(maTabColor).getStr(), FSEND); rWorksheet-singleElement(XML_pageSetUpPr, // OOXTODO: XML_autoPageBreaks, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svl/source
svl/source/numbers/zforscan.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit abea6ac4580a0d8ce48527d7cec4b4df087a541a
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 16:28:32 2014 +0200
detect * with no character following as invalid format code
... so adding it to the list in Format Numbers using the checkmark
button is not possible.
Change-Id: I57ca6a7a3617583a82a99c87291373b1fe4e246d
(cherry picked from commit bf674ab0f3097ad122c727b4d86f004f8cce1f61)
Reviewed-on: https://gerrit.libreoffice.org/10998
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 68959bc..813dede 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -933,6 +933,11 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const
OUString rString)
}
else
{
+// Valid only if there is a character following, else we are
+// at the end of a code that does not have a fill character
+// (yet?).
+if (sStrArray[nAnzStrings].getLength() 2)
+return nPos;
bStar = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svl/source
svl/source/numbers/zforscan.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 20e714167a713ef1129cb2f82bb650c803a5bf0c
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 18 16:28:32 2014 +0200
detect * with no character following as invalid format code
... so adding it to the list in Format Numbers using the checkmark
button is not possible.
Change-Id: I57ca6a7a3617583a82a99c87291373b1fe4e246d
(cherry picked from commit bf674ab0f3097ad122c727b4d86f004f8cce1f61)
Reviewed-on: https://gerrit.libreoffice.org/10999
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 4165b9f..f03b17a 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -929,6 +929,11 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const
OUString rString)
}
else
{
+// Valid only if there is a character following, else we are
+// at the end of a code that does not have a fill character
+// (yet?).
+if (sStrArray[nAnzStrings].getLength() 2)
+return nPos;
bStar = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement
Hi, All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards, -- Hiroto Kagotani hiroto.kagot...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 82744] New: WebDAV LOCK is released when document is saved
https://bugs.freedesktop.org/show_bug.cgi?id=82744 Priority: medium Bug ID: 82744 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: WebDAV LOCK is released when document is saved Severity: normal Classification: Unclassified OS: All Reporter: i...@medizinische-genetik.de Hardware: Other Status: UNCONFIRMED Version: 4.3.0.4 release Component: Libreoffice Product: LibreOffice This is an aftereffect of Bug #72157: Problem: When a document is opened via WebDAV and saved (not closed), then LibreOffice releases mistakenly the LOCK. This must only happen, when the document is closed and not just saved. Steps to reproduce: 1. Open a document via WebDAV (GET + LOCK is send to the webserver) 2. Save the document on WebDAV (UNLOCK + PUT is send to the webserver) 3. Close the document (nothing is send to the webserver) Affected versions: - 4.2.6.2 (release) - 4.3.0.4 (release) Additional comments: In Bug #72157 comment 28 and later some other people already confirmed this problem. Samuel Mehrbrodt told to create a new bug report about this issue. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72157] LibreOffice does not release WebDAV file lock on document close
https://bugs.freedesktop.org/show_bug.cgi?id=72157 --- Comment #33 from i...@medizinische-genetik.de --- (In reply to comment #32) Please create a new bug and add me and Matus in CC. Done: https://bugs.freedesktop.org/show_bug.cgi?id=82744 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
