[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/attr/format.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit df00256fce04f4d2ab795cc325342cc5c86abda6 Author: Armin Le Grand a...@apache.org Date: Thu Mar 20 18:37:31 2014 + fix build breaker, missing includes diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 2a3d5f0..c36b13f 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -33,6 +33,7 @@ // #include unobrushitemhelper.hxx #include svx/xdef.hxx +#include frmatr.hxx TYPEINIT1( SwFmt, SwClient ); //rtti fuer SwFmt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/new-chart-type-skeleton' - 3 commits - chart2/Library_chartcontroller.mk chart2/source icon-themes/galaxy
chart2/Library_chartcontroller.mk |1
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 16 +--
chart2/source/controller/dialogs/Bitmaps.hrc |9 +-
chart2/source/controller/dialogs/Bitmaps.src |5 +
chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx | 41
++
chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx | 32
+++
chart2/source/controller/dialogs/Strings_ChartTypes.src |5 -
chart2/source/controller/dialogs/res_ErrorBar.cxx |6 -
chart2/source/controller/dialogs/tp_ChartType.cxx | 10 +-
chart2/source/controller/inc/res_ErrorBar.hxx |2
chart2/source/controller/main/ControllerCommandDispatch.cxx |2
chart2/source/inc/Strings.hrc |7 -
icon-themes/galaxy/chart2/res/typegl3dbar_16.png |binary
13 files changed, 111 insertions(+), 25 deletions(-)
New commits:
commit b16d99d61698f0983ad84c2c0b97ce0d43f79cf4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 20 20:53:42 2014 -0400
Image for the new chart type.
Change-Id: Idba626c947cc7875bdcdf13677f2161c4d5b68c5
diff --git a/icon-themes/galaxy/chart2/res/typegl3dbar_16.png
b/icon-themes/galaxy/chart2/res/typegl3dbar_16.png
new file mode 100644
index 000..ada848c
Binary files /dev/null and b/icon-themes/galaxy/chart2/res/typegl3dbar_16.png
differ
commit 20ef92a550d88c6b6b831330d14a23c275c26a9e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 20 20:52:11 2014 -0400
Add a new chart type GL 3D Bar (working name).
Change-Id: I0b0a65bf4f9365a8d522e3c439afe19797b2fdd5
diff --git a/chart2/Library_chartcontroller.mk
b/chart2/Library_chartcontroller.mk
index 6a4907f..86c2a04 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -87,6 +87,7 @@ $(eval $(call
gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty \
chart2/source/controller/dialogs/ChangingResource \
chart2/source/controller/dialogs/ChartTypeDialogController \
+chart2/source/controller/dialogs/GL3DBarChartDialogController \
chart2/source/controller/dialogs/DataBrowser \
chart2/source/controller/dialogs/DataBrowserModel \
chart2/source/controller/dialogs/DialogModel \
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc
b/chart2/source/controller/dialogs/Bitmaps.hrc
index 6f99eff..b5fc1e7 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -39,10 +39,11 @@
#define IMG_TYPE_NET(RID_APP_START + 8)
#define IMG_TYPE_STOCK (RID_APP_START + 9)
#define IMG_TYPE_COLUMN_LINE (RID_APP_START + 10)
-#define IMG_STEP_START (RID_APP_START + 11)
-#define IMG_STEP_END(RID_APP_START + 12)
-#define IMG_STEP_CENTER_X (RID_APP_START + 13)
-#define IMG_STEP_CENTER_Y (RID_APP_START + 14)
+#define IMG_TYPE_GL3D_BAR (RID_APP_START + 11)
+#define IMG_STEP_START (RID_APP_START + 12)
+#define IMG_STEP_END(RID_APP_START + 13)
+#define IMG_STEP_CENTER_X (RID_APP_START + 14)
+#define IMG_STEP_CENTER_Y (RID_APP_START + 15)
//Chart Subtypes
diff --git a/chart2/source/controller/dialogs/Bitmaps.src
b/chart2/source/controller/dialogs/Bitmaps.src
index 802de33..c088844 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -68,6 +68,11 @@ Image IMG_TYPE_BUBBLE
ImageBitmap = Bitmap { File = typebubble_16.png ; };
MaskColor = STD_MASKCOLOR;
};
+Image IMG_TYPE_GL3D_BAR
+{
+ImageBitmap = Bitmap { File = typegl3dbar_16.png ; };
+MaskColor = STD_MASKCOLOR;
+};
Image IMG_STEP_START
{
ImageBitmap = Bitmap { File = step_start_30.png ; };
diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
new file mode 100644
index 000..907c8f4
--- /dev/null
+++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include GL3DBarChartDialogController.hxx
+#include Strings.hrc
+#include Bitmaps.hrc
+#include ResId.hxx
+
+namespace chart {
+
+GL3DBarChartDialogController::GL3DBarChartDialogController() {}
+
+GL3DBarChartDialogController::~GL3DBarChartDialogController() {}
+
+OUString GL3DBarChartDialogController::getName()
+{
+return SchResId(STR_TYPE_GL3D_BAR).toString();
+}
+
+Image
[Libreoffice-commits] core.git: vcl/null
vcl/null/printerinfomanager.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0f95b244e689c72bb5ca5a9ea12a5910c069fc48
Author: Tor Lillqvist t...@collabora.com
Date: Fri Mar 21 09:32:10 2014 +0200
Fix syntax error
Change-Id: Id646518713124d34971da2843aa201b093861792
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index d787219..f79c018 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -45,7 +45,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) :
m_eType( eType ),
m_bUseIncludeFeature( false ),
m_bUseJobPatch( true ),
-m_aSystemDefaultPaper( A4 ),
+m_aSystemDefaultPaper( A4 )
{
// initSystemDefaultPaper();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#53472 Created Dynamic Integral Node classes. Integrals size made dependent on body.
Hi everybody, I am posting my first LO patch. https://gerrit.libreoffice.org/#/c/8569/ This code adds a new node structure in StarMath to deal with dynamic integrals. I introduce a command intd in addition to the standard int, intd is able to resize according to the size of its argument. This is supposed to be a first step in the potential inclusion of other dynamically-sized symbols for sums, products... Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-03-21
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#76360 : Embedded Data UT is failing on Windows Build in https://gerrit.libreoffice.org/8660 from Ravindra Vidhate about module sw + fdo#76361 : LO crash: LO crashes while saving the document to docx in https://gerrit.libreoffice.org/8677 from Rajashri Udhoji about module sw + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal about module sc, starmath + fdo#76356 : Docx file contianing chart in footer/header gets corrupted. in https://gerrit.libreoffice.org/8674 from Sushil Shinde about module chart2, oox, sw, writerfilter End of freshness + fdo#56284 : soffice fails to start unless ~/.config exists and is writabl in https://gerrit.libreoffice.org/8630 from Michaël Lefèvre about module sal + fdo#69878: Add [sub|super]script entry to text style context submenu in https://gerrit.libreoffice.org/8684 from Katarina Behrens about module sd + Improve Accessibility mapping of roles for Mac in https://gerrit.libreoffice.org/8682 from Niklas Johansson about module vcl + fdo#57950 Replace chained append in htmlatr.cxx in https://gerrit.libreoffice.org/8661 from Krisztian Pinter about module sw * Merged changes on master for project core changed in the last 25 hours: + cosmetic: split PhysicalFontFamily/Collection out of outdev3.cxx in https://gerrit.libreoffice.org/8673 from Norbert Thiebaud + Translate names of months and the days of the week in Japanese calendars in https://gerrit.libreoffice.org/8678 from Takeshi Abe + Revert CppunitTest_sw_ooxmlexport: disable failing check on Mac for now in https://gerrit.libreoffice.org/8679 from Jan-Marek Glogowski + fdo#76312: LO crashes - endTableCell is called before StartTable. in https://gerrit.libreoffice.org/8659 from Umesh Kadam + fdo#76101 [DOCX] Export: Limit no of styles in styles.xml in https://gerrit.libreoffice.org/8653 from Vinaya Mandke + fdo#39468 Translate German Comments - shellio.cxx in https://gerrit.libreoffice.org/8667 from Christian M. Heller + fdo#39468 Translate German Comments - iodetect.cxx in https://gerrit.libreoffice.org/8665 from Christian M. Heller + fdo#39468 Translate German Comments - fltini.cxx in https://gerrit.libreoffice.org/8664 from Christian M. Heller + fdo#39468 Translate German Comments - docfact.cxx in https://gerrit.libreoffice.org/8663 from Christian M. Heller + Handle altname in docx's fonttable.xml in https://gerrit.libreoffice.org/8616 from Chris Sherlock + svx: speed up ObjectContactOfPageView in case there is nothing to display in https://gerrit.libreoffice.org/8675 from Miklos Vajna * Abandoned changes on master for project core changed in the last 25 hours: + fdo#64290 UI: count selected rows and columns in https://gerrit.libreoffice.org/8489 from Sujay m + cosmetic: split PhysicalFontFace class it its own source/header in https://gerrit.libreoffice.org/8672 from Norbert Thiebaud + rename ImplDevFontList to PhysicalFontCollection in https://gerrit.libreoffice.org/8671 from Norbert Thiebaud + replace DevFontList with PhysicalFontFamilies propagate the naming change in https://gerrit.libreoffice.org/8670 from Norbert Thiebaud + rename ImplDevFontListData to PhysicalFontFamily in https://gerrit.libreoffice.org/8669 from Norbert Thiebaud * Open changes needing tweaks, but being untouched for more than a week: + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + sal: use posix_memalign only if it's available in https://gerrit.libreoffice.org/8405 from Douglas Mencken + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that
[Libreoffice-commits] core.git: writerfilter/inc
writerfilter/inc/resourcemodel/OutputWithDepth.hxx | 127
writerfilter/inc/resourcemodel/SubSequence.hxx | 98 ---
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx |1
3 files changed, 226 deletions(-)
New commits:
commit 71baf7278beffc6af99a4bd15c86550cbe61a077
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Mar 21 09:12:25 2014 +0100
writerfilter: remove unused OutputWithDepth
This was only used by doctok.
Change-Id: Ic8f853a02af4915e3d5984a626daa7147c47d16f
diff --git a/writerfilter/inc/resourcemodel/OutputWithDepth.hxx
b/writerfilter/inc/resourcemodel/OutputWithDepth.hxx
deleted file mode 100644
index 6899de4..000
--- a/writerfilter/inc/resourcemodel/OutputWithDepth.hxx
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_OUTPUT_WITH_DEPTH
-#define INCLUDED_OUTPUT_WITH_DEPTH
-
-#include vector
-#include iostream
-
-namespace writerfilter
-{
-
-using namespace ::std;
-
-template typename T
-class OutputWithDepth
-{
-typedef ::std::vectorT Group_t;
-Group_t mGroup;
-
-unsigned int mnCurrentDepth;
-unsigned int mnGroupDepth;
-
-T mOpenTag;
-T mCloseTag;
-
-protected:
-virtual void output(const T aItem) const = 0;
-void outputGroup();
-void finalize();
-
-public:
-OutputWithDepth(const T aOpenTag, const T aCloseTag);
-virtual ~OutputWithDepth();
-
-void openGroup();
-void closeGroup();
-void addItem(const T aItem);
-void setDepth(unsigned int nDepth);
-};
-
-template typename T
-OutputWithDepthT::OutputWithDepth(const T aOpenTag, const T aEndTag)
-: mnCurrentDepth(0)
-, mnGroupDepth(0)
-, mOpenTag(aOpenTag)
-, mCloseTag(aEndTag)
-{
-}
-
-template typename T
-OutputWithDepthT::~OutputWithDepth()
-{
-}
-
-template typename T
-void OutputWithDepthT::finalize()
-{
-outputGroup();
-}
-
-template typename T
-void OutputWithDepthT::openGroup()
-{
-outputGroup();
-mnGroupDepth = 0;
-}
-
-template typename T
-void OutputWithDepthT::closeGroup()
-{
-if (mnGroupDepth mnCurrentDepth)
-for (unsigned int i = 0; i mnGroupDepth - mnCurrentDepth; ++i)
-output(mOpenTag);
-else if (mnGroupDepth mnCurrentDepth)
-for (unsigned int i = 0; i mnCurrentDepth - mnGroupDepth; ++i)
-output(mCloseTag);
-
-outputGroup();
-
-mnCurrentDepth = mnGroupDepth;
-}
-
-template typename T
-void OutputWithDepthT::addItem(const T aItem)
-{
-mGroup.push_back(aItem);
-}
-
-template typename T
-void OutputWithDepthT::setDepth(unsigned int nDepth)
-{
-mnGroupDepth = nDepth;
-}
-
-template typename T
-void OutputWithDepthT::outputGroup()
-{
-typename Group_t::iterator aItEnd = mGroup.end();
-
-for (typename Group_t::iterator aIt = mGroup.begin(); aIt != aItEnd; aIt++)
-{
-output(*aIt);
-}
-
-mGroup.clear();
-}
-}
-#endif // INCLUDED_OUTPUT_WITH_DEPTH
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/resourcemodel/SubSequence.hxx
b/writerfilter/inc/resourcemodel/SubSequence.hxx
index f4e08c7..6b6b1ed 100644
--- a/writerfilter/inc/resourcemodel/SubSequence.hxx
+++ b/writerfilter/inc/resourcemodel/SubSequence.hxx
@@ -28,7 +28,6 @@
#include ctype.h
#include exceptions.hxx
#include WriterFilterDllApi.hxx
-#include resourcemodel/OutputWithDepth.hxx
namespace writerfilter {
using namespace ::std;
@@ -36,10 +35,6 @@ using namespace ::std;
template class T
class SubSequence;
-template typename T
-void dumpLine(OutputWithDepthstring o, SubSequenceT rSeq,
- sal_uInt32 nOffset, sal_uInt32 nStep);
-
template class T
class SubSequence
{
@@ -185,44 +180,6 @@ public:
o /sequence endl;
}
-void dump(OutputWithDepthstring o)
-{
-{
-char sBuffer[256];
-
-snprintf(sBuffer, sizeof(sBuffer),
- sequence id='%p' offset='% SAL_PRIxUINT32 ' count='%
SAL_PRIxUINT32 ',
- mpSequence.get(), mnOffset, mnCount);
-o.addItem(sBuffer);
-
[Libreoffice-commits] core.git: 11 commits - filter/source package/source starmath/source sw/source writerfilter/source
filter/source/flash/swfwriter1.cxx|2 ++
package/source/zipapi/ZipFile.cxx | 13 ++---
package/source/zipapi/ZipOutputStream.cxx |2 ++
starmath/source/cursor.cxx|5 +
sw/source/core/frmedt/fetab.cxx |4 ++--
sw/source/core/txtnode/ndtxt.cxx | 10 +-
sw/source/filter/ww8/ww8par5.cxx |2 +-
sw/source/ui/frmdlg/frmpage.cxx |3 +--
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 ++
9 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 52cc0c8f05d40db6d076c13f8b8d6d9453ec8930
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 20 20:54:31 2014 +
coverity#982784 Unintentional integer overflow
Change-Id: Ib50e0987adf419ecdd569fc5dd5c8b2b1e246e2f
diff --git a/package/source/zipapi/ZipFile.cxx
b/package/source/zipapi/ZipFile.cxx
index 7255185..83505e2 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -1072,16 +1072,15 @@ sal_Int32 ZipFile::getCRC( sal_Int64 nOffset, sal_Int64
nSize )
Sequence sal_Int8 aBuffer;
CRC32 aCRC;
-sal_Int32 nBlockSize = static_cast sal_Int32 (::std::min( nSize,
static_cast sal_Int64 ( 32000 ) ) );
+sal_Int64 nBlockSize = ::std::min(nSize, static_cast sal_Int64 (32000));
aGrabber.seek( nOffset );
-for ( int ind = 0;
- aGrabber.readBytes( aBuffer, nBlockSize ) ind * nBlockSize
nSize;
- ind++ )
+for (sal_Int64 ind = 0;
+ aGrabber.readBytes( aBuffer, nBlockSize ) ind * nBlockSize nSize;
+ ++ind)
{
-sal_Int64 nLen = ::std::min( static_cast sal_Int64 ( nBlockSize ),
- nSize - ind * nBlockSize );
-aCRC.updateSegment( aBuffer, 0, static_cast sal_Int32 ( nLen ) );
+sal_Int64 nLen = ::std::min(nBlockSize, nSize - ind * nBlockSize);
+aCRC.updateSegment(aBuffer, 0, static_castsal_Int32(nLen));
}
return aCRC.getValue();
commit 16b6b45e8ca1e727694a52525cf35782c0d69978
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 20 20:47:10 2014 +
coverity#707964 Uninitialized scalar field
Change-Id: I051e5ae4200563426d810e9a4d94ab02fb8ccf51
diff --git a/package/source/zipapi/ZipOutputStream.cxx
b/package/source/zipapi/ZipOutputStream.cxx
index 14c5f57..e9f1b65 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -48,6 +48,8 @@ ZipOutputStream::ZipOutputStream( const uno::Reference
uno::XComponentContext
, aChucker(xOStream)
, pCurrentEntry(NULL)
, nMethod(DEFLATED)
+, nLevel(0)
+, mnDigested(0)
, bFinished(sal_False)
, bEncryptCurrentEntry(sal_False)
, m_pCurrentStream(NULL)
commit 383dbc04ee65b60e7946893614a6e6bb80981599
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 20 16:52:22 2014 +
coverity#705160 Missing break in switch
Change-Id: I7be86ec16743dd8342cd82c9fcd089cb36d668ce
diff --git a/filter/source/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index 754f876..4a67720 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1803,7 +1803,7 @@ void Writer::Impl_writeActions( const GDIMetaFile rMtf )
const MetaISectRectClipRegionAction* pA = (const
MetaISectRectClipRegionAction*) pAction;
clipRect = pA-GetRect();
}
-//fall-through
+// fall-through
case( META_CLIPREGION_ACTION ):
case( META_ISECTREGIONCLIPREGION_ACTION ):
case( META_MOVECLIPREGION_ACTION ):
@@ -1816,6 +1816,7 @@ void Writer::Impl_writeActions( const GDIMetaFile rMtf )
{
bMap++;
}
+// fall-through
case( META_REFPOINT_ACTION ):
case( META_LINECOLOR_ACTION ):
case( META_FILLCOLOR_ACTION ):
commit bb7d4a00941bc4394b35e79545ab48fb345b7bf9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 20 16:51:10 2014 +
coverity#705159 Missing break in switch
Change-Id: I61975ae42519d2fc9e0074a32ad2a504c6821641
diff --git a/filter/source/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index 0d7b7b0..754f876 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1803,6 +1803,7 @@ void Writer::Impl_writeActions( const GDIMetaFile rMtf )
const MetaISectRectClipRegionAction* pA = (const
MetaISectRectClipRegionAction*) pAction;
clipRect = pA-GetRect();
}
+//fall-through
case( META_CLIPREGION_ACTION ):
case( META_ISECTREGIONCLIPREGION_ACTION ):
case( META_MOVECLIPREGION_ACTION ):
commit 46c95fa7407df716795d4350506d57b2ed1fb11d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 20
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - setup_native/source
setup_native/source/mac/ooo/osxdndinstall.png |binary 1 file changed New commits: commit 4600f1141487ebf408064587a93ef3ac0059676b Author: Andras Timar andras.ti...@collabora.com Date: Fri Mar 21 09:56:37 2014 +0100 OSX install background image 72 DPI Change-Id: Ia9d24745c453643cf15247385929a1e22bac4d46 diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png index 5f98290..74a08b8 100644 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/textcharacterproperties.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 258c8cc66ac5a91e4779d47bc3b3eafc7287332a
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Mar 21 10:06:33 2014 +0100
oox: don't fill CharInteropGrabBag if the property doesn't exist
Change-Id: Ic7d543a8155cfe5ec39d34c8cd7133f14f8f3cc9
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index bb7b227..6f64f2a 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -163,6 +163,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap
rPropMap, const XmlFil
void pushToGrabBag( PropertySet rPropSet, const std::vectorPropertyValue
aVectorOfProperyValues )
{
+if (!rPropSet.hasProperty(PROP_CharInteropGrabBag) ||
aVectorOfProperyValues.empty())
+return;
SequencePropertyValue aGrabBag;
Any aAnyGrabBag = rPropSet.getAnyProperty(PROP_CharInteropGrabBag);
aAnyGrabBag = aGrabBag;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/core/xmlfilterbase.cxx| 17 -
sw/qa/extras/inc/swmodeltestbase.hxx |1 +
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 5299cc26d136af179328f6e560040e1eabe8b9c8
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Mar 21 09:40:58 2014 +0100
DOCX export of paragraph count in app.xml
Change-Id: Ie2fd4af3340c48c915eada74760cb414848f8a8b
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 130ae9e..5fc7c87 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -639,7 +639,6 @@ writeAppProperties( XmlFilterBase rSelf, Reference
XDocumentProperties xProp
writeElement( pAppProps, XML_Characters,characters );
writeElement( pAppProps, XML_PresentationFormat,presentation format
);
writeElement( pAppProps, XML_Lines, lines );
-writeElement( pAppProps, XML_Paragraphs,paragraphs );
writeElement( pAppProps, XML_Slides,slides );
writeElement( pAppProps, XML_Notes, notes );
#endif /* def OOXTODO */
@@ -663,6 +662,22 @@ writeAppProperties( XmlFilterBase rSelf, Reference
XDocumentProperties xProp
writeElement( pAppProps, XML_AppVersion,app version );
writeElement( pAppProps, XML_DocSecurity, doc security );
#endif /* def OOXTODO */
+
+uno::Sequencebeans::NamedValue aStats =
xProperties-getDocumentStatistics();
+for (sal_Int32 i = 0; i aStats.getLength(); ++i)
+{
+sal_Int32 nValue = 0;
+if (aStats[i].Value = nValue)
+{
+OUString aValue = OUString::number(nValue);
+if (aStats[i].Name == ParagraphCount)
+{
+writeElement(pAppProps, XML_Paragraphs, aValue);
+break;
+}
+}
+}
+
pAppProps-endElement( XML_Properties );
}
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 1fb6c48..20d76cc 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -554,6 +554,7 @@ protected:
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(m),
BAD_CAST(http://schemas.openxmlformats.org/officeDocument/2006/math;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(ContentType),
BAD_CAST(http://schemas.openxmlformats.org/package/2006/content-types;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(lc),
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(extended-properties),
BAD_CAST(http://schemas.openxmlformats.org/officeDocument/2006/extended-properties;));
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
return pXmlXpathObj-nodesetval;
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 360c502..a1542d9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -106,6 +106,10 @@ DECLARE_OOXMLEXPORT_TEST(testZoom, zoom.docx)
int nNext = getXPathPosition(pXmlDoc, /w:styles/w:style[3], next);
int nRsid = getXPathPosition(pXmlDoc, /w:styles/w:style[3], rsid);
CPPUNIT_ASSERT(nNext nRsid);
+
+pXmlDoc = parseExport(docProps/app.xml);
+// One paragraph in the document.
+assertXPathContent(pXmlDoc,
/extended-properties:Properties/extended-properties:Paragraphs, 1);
}
DECLARE_OOXMLEXPORT_TEST(defaultTabStopNotInStyles, empty.odt)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source vcl/unx
svl/source/items/nranges.cxx| 24 +++-
svl/source/items/poolio.cxx |9 +
svl/source/misc/PasswordHelper.cxx | 13 +
vcl/unx/generic/app/saldisp.cxx |7 +++
vcl/unx/generic/printer/jobdata.cxx |7 ---
5 files changed, 28 insertions(+), 32 deletions(-)
New commits:
commit fc8b8033c645bb94484c51ddad4ed82add0cf6bc
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Mar 21 19:16:11 2014 +0900
Avoid possible resource leaks by boost::scoped_array
Change-Id: I4287fa05e35c132fb6e11d95dd17c3d3bf29defc
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index c9fc72d..13d58b0 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -20,7 +20,7 @@
#include cassert
#include vector
// compiled via include from itemset.cxx only!
-
+#include boost/scoped_array.hpp
#ifdef DBG_UTIL
@@ -436,9 +436,9 @@ SfxUShortRanges SfxUShortRanges::operator -=
// (size is computed for maximal possibly split-count plus terminating 0)
sal_uInt16 nThisSize = Count_Impl(_pRanges);
sal_uInt16 nTargetSize = 1 + ( nThisSize + Count_Impl(rRanges._pRanges) );
-sal_uInt16 *pTarget = new sal_uInt16[ nTargetSize ];
-memset( pTarget, 0, sizeof(sal_uInt16)*nTargetSize );
-memcpy( pTarget, _pRanges, sizeof(sal_uInt16)*nThisSize );
+boost::scoped_arraysal_uInt16 pTarget(new sal_uInt16[ nTargetSize ]);
+memset( pTarget.get(), 0, sizeof(sal_uInt16)*nTargetSize );
+memcpy( pTarget.get(), _pRanges, sizeof(sal_uInt16)*nThisSize );
sal_uInt16 nPos1 = 0, nPos2 = 0, nTargetPos = 0;
while( _pRanges[ nPos1 ] )
@@ -540,16 +540,15 @@ SfxUShortRanges SfxUShortRanges::operator -=
// assign the differentiated ranges
delete[] _pRanges;
-sal_uInt16 nUShorts = Count_Impl(pTarget) + 1;
+sal_uInt16 nUShorts = Count_Impl(pTarget.get()) + 1;
if ( 1 != nUShorts )
{
_pRanges = new sal_uInt16[ nUShorts ];
-memcpy( _pRanges, pTarget, nUShorts * sizeof(sal_uInt16) );
+memcpy( _pRanges, pTarget.get(), nUShorts * sizeof(sal_uInt16) );
}
else
_pRanges = 0;
-delete [] pTarget;
return *this;
}
@@ -587,9 +586,9 @@ SfxUShortRanges SfxUShortRanges::operator /=
// (size is computed for maximal possibly split-count plus terminating 0)
sal_uInt16 nThisSize = Count_Impl(_pRanges);
sal_uInt16 nTargetSize = 1 + ( nThisSize + Count_Impl(rRanges._pRanges) );
-sal_uInt16 *pTarget = new sal_uInt16[ nTargetSize ];
-memset( pTarget, 0, sizeof(sal_uInt16)*nTargetSize );
-memcpy( pTarget, _pRanges, sizeof(sal_uInt16)*nThisSize );
+boost::scoped_arraysal_uInt16 pTarget(new sal_uInt16[ nTargetSize ]);
+memset( pTarget.get(), 0, sizeof(sal_uInt16)*nTargetSize );
+memcpy( pTarget.get(), _pRanges, sizeof(sal_uInt16)*nThisSize );
sal_uInt16 nPos1 = 0, nPos2 = 0, nTargetPos = 0;
while( _pRanges[ nPos1 ] != 0 rRanges._pRanges[ nPos2 ] != 0 )
@@ -659,16 +658,15 @@ SfxUShortRanges SfxUShortRanges::operator /=
// assign the intersected ranges
delete[] _pRanges;
-sal_uInt16 nUShorts = Count_Impl(pTarget) + 1;
+sal_uInt16 nUShorts = Count_Impl(pTarget.get()) + 1;
if ( 1 != nUShorts )
{
_pRanges = new sal_uInt16[ nUShorts ];
-memcpy( _pRanges, pTarget, nUShorts * sizeof(sal_uInt16) );
+memcpy( _pRanges, pTarget.get(), nUShorts * sizeof(sal_uInt16) );
}
else
_pRanges = 0;
-delete [] pTarget;
return *this;
}
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 90d952a..7f2dc56 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -28,6 +28,7 @@
#include svl/brdcst.hxx
#include svl/filerec.hxx
#include poolio.hxx
+#include boost/scoped_array.hpp
// STATIC DATA ---
@@ -762,10 +763,10 @@ SvStream SfxItemPool::Load1_Impl(SvStream rStream)
CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_SIZES );
sal_uInt32 nSizeTableLen(0);
rStream.ReadUInt32( nSizeTableLen );
-sal_Char *pBuf = new sal_Char[nSizeTableLen];
-rStream.Read( pBuf, nSizeTableLen );
+boost::scoped_arraysal_Char pBuf(new sal_Char[nSizeTableLen]);
+rStream.Read( pBuf.get(), nSizeTableLen );
sal_uLong nEndOfSizes = rStream.Tell();
-SvMemoryStream aSizeTable( pBuf, nSizeTableLen, STREAM_READ );
+SvMemoryStream aSizeTable( pBuf.get(), nSizeTableLen, STREAM_READ );
// ab Version 1.3 steht in der Size-Table eine Versions-Map
if ( pImp-nMajorVer 1 || pImp-nMinorVer = 3 )
@@ -968,7 +969,7 @@ SvStream SfxItemPool::Load1_Impl(SvStream rStream)
rStream.Seek( nPos + nSize );
}
-delete[] pBuf;
+pBuf.reset();
rStream.Seek(nEndOfSizes);
CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_ENDPOOL );
CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_ENDPOOL );
Re: GSOC application disscusion
Hi Arnav, On Fri, Mar 21, 2014 at 10:06:42AM +, Arnav Singh arnav...@gmail.com wrote: hello, i am a student of post graduation in CS... i am willing to participate in GSOC and do Connection to SharePoint and/or Microsoft OneDrive..and work on this project...can i still apply..?? Yes, you can, though you don't have much remaining time. ;-) See here for timeline: http://www.google-melange.com/gsoc/events/google/gsoc2014 See here how to apply: https://wiki.documentfoundation.org/Development/GSoC#How_to_apply Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfsprm.hxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 8cde8ea2b78cd66ab2ecf63221678eb70b4f4c32 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 21 11:56:14 2014 +0100 Missing includes Change-Id: I6926b018a96a2dc52c5b080584b94c8009384aa7 diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx index c9ee0c6..eb18f6d 100644 --- a/writerfilter/source/rtftok/rtfsprm.hxx +++ b/writerfilter/source/rtftok/rtfsprm.hxx @@ -10,6 +10,12 @@ #ifndef _RTFSPRM_HXX_ #define _RTFSPRM_HXX_ +#include sal/config.h + +#include string +#include utility +#include vector + #include boost/intrusive_ptr.hpp #include rtfcontrolwords.hxx #include rtfvalue.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 14 commits - writerfilter/source xmloff/source xmlscript/source xmlsecurity/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +
xmloff/source/draw/ximpstyl.cxx|2 -
xmloff/source/style/undlihdl.cxx |1
xmloff/source/style/xmlbahdl.cxx |5 ++-
xmloff/source/text/XMLTextListBlockContext.cxx |1
xmloff/source/text/txtfldi.cxx | 32 ++---
xmloff/source/text/txtparae.cxx| 11 ++--
xmlscript/source/xmldlg_imexp/exp_share.hxx| 20 ++-
xmlscript/source/xmldlg_imexp/imp_share.hxx| 12 +++--
xmlscript/source/xmllib_imexp/imp_share.hxx| 24 --
xmlscript/source/xmlmod_imexp/imp_share.hxx| 14 +++---
xmlsecurity/source/helper/xsecctl.cxx | 19 +-
xmlsecurity/source/helper/xsecparser.cxx | 17 -
13 files changed, 106 insertions(+), 54 deletions(-)
New commits:
commit 5c291a0287af46558d3ef96d18b114c371ddd31b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 11:12:44 2014 +
coverity#736084 Missing break in switch
Change-Id: I3c7a032441402455d0a6ed28fc2cd5ce958ead04
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7e971a1..776f1de 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2678,11 +2678,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
RTFValue::Pointer_t pValue(new RTFValue(1));
m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TrPrBase_cantSplit, pValue);
}
+break;
case RTF_SECTUNLOCKED:
{
RTFValue::Pointer_t pValue(new RTFValue(int(!nParam)));
m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_formProt,
pValue);
}
+break;
case RTF_PGNDEC:
case RTF_PGNUCRM:
case RTF_PGNLCRM:
commit b45270bbfe62102af2300ae6450930d25131f854
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 11:07:03 2014 +
coverity#705095 Unchecked dynamic_cast
Change-Id: Ia8291acbba50c492568b11e1eb852e7b84885633
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 1f1c6f5..3444740 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1608,7 +1608,7 @@ sal_Bool SdXMLHeaderFooterDeclContext::IsTransient() const
void SdXMLHeaderFooterDeclContext::EndElement()
{
-SdXMLImport rImport = *dynamic_cast SdXMLImport* ( GetImport() );
+SdXMLImport rImport = dynamic_castSdXMLImport(GetImport());
if( IsXMLToken( GetLocalName(), XML_HEADER_DECL ) )
{
rImport.AddHeaderDecl( maStrName, maStrText );
commit fe0f96e4aafc9ae39fab7bc13e7fd9563ff30cd8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 11:03:45 2014 +
coverity#705345 Missing break in switch
Change-Id: I7ed37e384a0f3bb3863d957ac0333ddc2c7434a3
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 7043194..a2d8da6 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -209,6 +209,7 @@ bool XMLUnderlineStylePropHdl::importXML( const OUString
rStrImpValue, uno::Any
case awt::FontUnderline::SINGLE:
// keep double or bold line style
eNewUnderline = eUnderline;
+//fall-through
case awt::FontUnderline::DOTTED:
// The line style has priority over a double type.
if( awt::FontUnderline::BOLD == eUnderline )
commit 27a8609b2086d232c4d1ff8b92996d638b30cac1
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 11:02:12 2014 +
coverity#704114 Unchecked return value
Change-Id: I9f92b4536557d8f6f482d6ce7646125035db3f1d
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 0a797e5..9d94f6a 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -889,10 +889,11 @@ bool XMLNumberWithAutoInsteadZeroPropHdl::exportXML(
OUString rStrExpValue, con
{
sal_Int32 nValue = 0;
-lcl_xmloff_getAny( rValue, nValue, 2 );
+bool bRet = lcl_xmloff_getAny( rValue, nValue, 2 );
+bRet = nValue != 0;
// FIXME: 0 is not a valid value - write auto instead
-if (0 == nValue || !rValue.hasValue())
+if (!bRet)
rStrExpValue = GetXMLToken( XML_AUTO );
else
{
commit a16846dada2dc14fdafe2ddb7535929a0fd97ab9
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 10:59:42 2014 +
coverity#705346 Missing break in switch
Change-Id: I80147bd28eedd9d1032cb173a653d4c52a1eb437
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx
b/xmloff/source/text/XMLTextListBlockContext.cxx
index 8e27678..75c8602 100644
---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - chart2/source
chart2/source/tools/NumberFormatterWrapper.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1b9f2f843723e45c0f5a8899b754f0dab01e5df6
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Mar 19 04:50:20 2014 +0100
the type in the Any is a util::Date and not a DateTime, fdo#74549
Either that was always broken or it is a recent regression that
operator= does not convert from Date to DateTime.
Change-Id: Ic948224c139ed84b3fe006385fcafd6ce16c30f1
(cherry picked from commit 22c7da0ca5438b69165609db2a1ef219aa167dc2)
Reviewed-on: https://gerrit.libreoffice.org/8652
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit d5580b252ad4cfea10422c044366c3c6c1ebed83)
Reviewed-on: https://gerrit.libreoffice.org/8666
Reviewed-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx
b/chart2/source/tools/NumberFormatterWrapper.cxx
index 1501532..4994215 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -26,7 +26,7 @@
#include svl/zformat.hxx
#include tools/color.hxx
#include i18nlangtag/mslangid.hxx
-#include com/sun/star/util/DateTime.hpp
+#include com/sun/star/util/Date.hpp
namespace chart
{
@@ -79,7 +79,7 @@ Date NumberFormatterWrapper::getNullDate() const
sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12;
Date aRet(nDay,nMonth,nYear);
-util::DateTime aUtilDate;
+util::Date aUtilDate;
if( m_aNullDate.hasValue() (m_aNullDate = aUtilDate) )
{
aRet = Date(aUtilDate.Day,aUtilDate.Month,aUtilDate.Year);
@@ -114,7 +114,7 @@ OUString NumberFormatterWrapper::getFormattedString(
sal_Int32 nNumberFormatKey,
nMonth = pDate-GetMonth();
nDay = pDate-GetDay();
} // if ( pDate )
-util::DateTime aNewNullDate;
+util::Date aNewNullDate;
m_aNullDate = aNewNullDate;
m_pNumberFormatter-ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year);
}
___
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' - swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 21 ++--- 1 file changed, 6 insertions(+), 15 deletions(-) New commits: commit 895c13faf15b4ebf45be23c461f49a8ab0fd4e09 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Feb 22 09:06:05 2014 +0100 Resolves: fdo#75308 Asterisk at the beginning of Paragraph without Nowiki The fix of fdo#74875 brings a huge regression since nowiki must be used With this patch, fdo#74875 is still ok hopefully. Change-Id: Ic6ed34630b40b09ab4f63166cbb1985b6313d168 Reviewed-on: https://gerrit.libreoffice.org/8167 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 1b14aa1..64474b3 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -1129,21 +1129,12 @@ param name=text/ choose - when test=contains($text, 'lt;') or contains($text, '[') or starts-with($text, '') or starts-with($text, '=') or starts-with($text, '*') or starts-with($text, ';') or starts-with($text, '#') - choose - when test=contains($text, 'lt;/nowikigt;') - textlt;nowikigt;/text - call-template name=render-escaped-text - with-param name=text select=$text/ - /call-template - textlt;/nowikigt;/text - /when - otherwise - call-template name=render-encoded-text - with-param name=text select=$text/ - /call-template - /otherwise - /choose + when test=contains($text, '[[') or starts-with($text, '') or starts-with($text, '=') or starts-with($text, '*') or starts-with($text, ';') or starts-with($text, '#') + textlt;nowikigt;/text + call-template name=render-encoded-text + with-param name=text select=$text/ + /call-template + textlt;/nowikigt;/text /when otherwise call-template name=render-encoded-text ___ 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-3' - editeng/source sw/qa
editeng/source/items/borderline.cxx |4 +-
sw/qa/extras/rtfimport/data/fdo68779.rtf | 25
sw/qa/extras/rtfimport/rtfimport.cxx | 62 +++
3 files changed, 90 insertions(+), 1 deletion(-)
New commits:
commit baac2e214ff41b18e33ad5d4e054d765ddb2b3d6
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 14 19:03:09 2014 +0100
fdo#68779: RTF import: set borders without explicit width
Word reportedly uses 0.75pt as a default if \brdrw is missing.
Change-Id: I263c56f756c65ff6bb30870aa70806564d5826a6
(cherry picked from commit 84f4de3b65cd0f861e80c69b773004f28f9f8d9f)
Reviewed-on: https://gerrit.libreoffice.org/8594
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 93f8e87dc7f488bbbfd8a748e47ce53936824391)
Reviewed-on: https://gerrit.libreoffice.org/8598
Reviewed-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index b393420..38c61e0 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -177,9 +177,11 @@ static const double OUTSET_line1 = 15.0;
static const double INSET_line2 = 15.0;
double
-ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const fWidth,
+ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const i_fWidth,
int const nWordLineStyle)
{
+// fdo#68779: at least for RTF, 0.75pt is the default if width is missing
+double const fWidth((i_fWidth == 0.0) ? 15.0 : i_fWidth);
switch (eStyle)
{
// Single lines
diff --git a/sw/qa/extras/rtfimport/data/fdo68779.rtf
b/sw/qa/extras/rtfimport/data/fdo68779.rtf
new file mode 100644
index 000..5dc7683
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo68779.rtf
@@ -0,0 +1,25 @@
+{\rtf1\ansi\ansicpg1251
+\paperw11907\paperh16840\psz9\margl1418\margr1984\margt2438\margb1531
+{\colortbl\red0\green0\blue0;}\deflang1049
+
+\trowd
+\clbrdrt\brdrs\clbrdrl\brdrs\clbrdrb\brdrs\clbrdrr\brdrs\cellx8335
+\pard\plain \intbl foo\cell \pard \intbl \row
+\pard \par
+
+\trowd
+\clbrdrt\brdrdot\clbrdrl\brdrdot\clbrdrb\brdrdot\clbrdrr\brdrdot\cellx8335
+\pard\plain \intbl foo\cell \pard \intbl \row
+\pard \par
+
+\trowd
+\clbrdrt\brdrdb\clbrdrl\brdrdb\clbrdrb\brdrdb\clbrdrr\brdrdb\cellx8335
+\pard\plain \intbl foo\cell \pard \intbl \row
+\pard \par
+
+\trowd
+\clbrdrt\brdrtnthmg\clbrdrl\brdrtnthmg\clbrdrb\brdrtnthmg\clbrdrr\brdrtnthmg\cellx8335
+\pard\plain \intbl foo\cell \pard \intbl \row
+\pard \par
+
+\pard \par}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 73bf749..0a16ab4 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1482,6 +1482,68 @@ DECLARE_RTFIMPORT_TEST(testFdo65090, fdo65090.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0),
TableColumnSeparators).getLength());
}
+DECLARE_RTFIMPORT_TEST(testTableBorderDefaults, fdo68779.rtf)
+{
+// table borders without \brdrw were not imported
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xCell(xTable-getCellByName(A1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 solid(
+1, 0, 26, 0, table::BorderLineStyle::SOLID, 26);
+CPPUNIT_ASSERT_BORDER_EQUAL(solid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(solid,
+getPropertytable::BorderLine2(xCell, RightBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(solid,
+getPropertytable::BorderLine2(xCell, TopBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(solid,
+getPropertytable::BorderLine2(xCell, BottomBorder));
+
+xTable.set(xTables-getByIndex(1), uno::UNO_QUERY);
+xCell.set(xTable-getCellByName(A1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 dotted(
+1, 0, 26, 0, table::BorderLineStyle::DOTTED, 26);
+CPPUNIT_ASSERT_BORDER_EQUAL(dotted,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(dotted,
+getPropertytable::BorderLine2(xCell, RightBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(dotted,
+getPropertytable::BorderLine2(xCell, TopBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(dotted,
+getPropertytable::BorderLine2(xCell, BottomBorder));
+
+xTable.set(xTables-getByIndex(2), uno::UNO_QUERY);
+xCell.set(xTable-getCellByName(A1), uno::UNO_QUERY);
+
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/menuids_tmpl.src | 16
1 file changed, 16 insertions(+)
New commits:
commit e262050a52a6ff154a219e9b0d5e1f66d20a3ead
Author: Katarina Behrens bu...@bubli.org
Date: Thu Mar 20 20:37:32 2014 +0100
fdo#69878: Add [sub|super]script entry to text style context submenu
Make Impress consistent with Writer in this regard
Change-Id: Ib01472d88c20f05a375b57d8a79576fc447cc250
Reviewed-on: https://gerrit.libreoffice.org/8684
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/app/menuids_tmpl.src
b/sd/source/ui/app/menuids_tmpl.src
index 4806f78..1b47207 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -491,6 +491,22 @@
HelpId = CMD_SID_ATTR_CHAR_CONTOUR ; \
Text [ en-US ] = ~Contour ; \
};\
+MenuItem\
+{\
+Separator = TRUE ; \
+};\
+MenuItem\
+{\
+Identifier = SID_SET_SUPER_SCRIPT; \
+HelpId = CMD_SID_SET_SUPER_SCRIPT; \
+Text [ en-US ] = Superscript ; \
+};\
+MenuItem\
+{\
+Identifier = SID_SET_SUB_SCRIPT; \
+HelpId = CMD_SID_SET_SUB_SCRIPT; \
+Text [ en-US ] = Subscript ; \
+};\
};\
};\
};
___
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/source
writerfilter/source/ooxml/OOXMLStreamImpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 08f4cb8af496adcbd4bd3dae5af040a614208c70
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Mar 20 21:17:44 2014 +
Don't duplicate relationship sequences while walking them.
Change-Id: If938f2f401af82d5d0122cbd0a78214829d1277c
Reviewed-on: https://gerrit.libreoffice.org/8685
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 90a9072..4890f31 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -206,13 +206,13 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Referenceembed::XRelationshipAccess
for (sal_Int32 j = 0; j aSeqs.getLength(); j++)
{
-uno::Sequence beans::StringPair aSeq = aSeqs[j];
+const uno::Sequence beans::StringPair aSeq = aSeqs[j];
bool bExternalTarget = false;
OUString sMyTarget;
for (sal_Int32 i = 0; i aSeq.getLength(); i++)
{
-beans::StringPair aPair = aSeq[i];
+const beans::StringPair aPair = aSeq[i];
if (aPair.First.compareTo(sType) == 0
( aPair.Second.compareTo(sStreamType) == 0 ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 509441038ab95dd3a60efd1b6c302bf22bfbc631 Author: Keith Curtis keit...@gmail.com Date: Mon Mar 17 20:16:57 2014 -0400 Hopefully fix Windows HiDPI toolbar layout bug On Windows HiDPI, toolbar buttons are cut off. This may fix the problem. Here is a screenshot: http://i.imgur.com/NADAvYi.png I can't prove this fixes anything on Windows because I can't see this on Linux and don't really understand the surrounding code. On the other hand, it is easy to prove this is reasonable code. Change-Id: I69c19ad46844bead942ce63883d163cb9d0690c9 Reviewed-on: https://gerrit.libreoffice.org/8637 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 3cb7322..61204c9 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1736,8 +1736,8 @@ bool ToolBox::ImplCalcItem() longnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; // set defaults if image or text is needed but empty -nDefWidth = GetDefaultImageSize().Width(); -nDefHeight = GetDefaultImageSize().Height(); +nDefWidth = GetDefaultImageSize().Width() * GetDPIScaleFactor(); +nDefHeight = GetDefaultImageSize().Height() * GetDPIScaleFactor(); mnWinHeight = 0; // determine minimum size necessary in NWF ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/test-hid-vs-ui.py
scripts/test-hid-vs-ui.py | 150 ++
1 file changed, 150 insertions(+)
New commits:
commit 6baa958036df478462427e4259c28c82e5d65adb
Author: Mathias Michel m...@gmx.fr
Date: Thu Mar 20 02:11:07 2014 +0100
fdo#67350 : sanity check utility for help ids wrt ui files
Change-Id: Ic7301fbb1fe3669a3d00893b6e9c8ec90b5d467e
Reviewed-on: https://gerrit.libreoffice.org/8668
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/scripts/test-hid-vs-ui.py b/scripts/test-hid-vs-ui.py
new file mode 100755
index 000..27fc068
--- /dev/null
+++ b/scripts/test-hid-vs-ui.py
@@ -0,0 +1,150 @@
+#!/usr/bin/env python
+# -*- 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/.
+#
+# Parses all help files (.xhp) to check that hids referencing .ui are
up-to-date
+# From fdo#67350
+
+
+import sys
+import argparse
+import os
+import subprocess
+import xml.etree.ElementTree as ET
+import collections
+import re
+import smtplib
+import email
+import email.mime.text
+import time
+import datetime
+
+# retrieve all hids related to .ui files
+def init_hids():
+global args
+repo_dir='/var/tmp/help.git'
+if not os.path.exists(repo_dir):os.makedirs(repo_dir)
+os.chdir(repo_dir)
+
+if not os.path.exists(os.path.join(repo_dir,'config')):
+
subprocess.call(['git','clone','--bare','git://gerrit.libreoffice.org/help',repo_dir])
+elif not args['git_static']:
+subprocess.call(['git','fetch','origin'])
+return
subprocess.check_output(['git','grep','hid=[^]*/[^]*','master','--'])
+
+# retrieve .ui files list from the core
+def init_core_files():
+global core_repo_dir
+core_repo_dir = args['core_repo_dir']
+if core_repo_dir is None: core_repo_dir = '/var/tmp/core.git'
+
+if not os.path.exists(core_repo_dir):os.makedirs(core_repo_dir)
+os.chdir(core_repo_dir)
+
+if not os.path.exists(os.path.join(core_repo_dir,'.git')):
+
subprocess.call(['git','clone','git://gerrit.libreoffice.org/core',core_repo_dir])
+elif not args['git_static']:
+subprocess.call(['git','fetch','origin'])
+allfiles =
subprocess.check_output(['git','ls-tree','--name-only','--full-name','-r','master'])
+return '\n'.join(re.findall('.*\.ui',allfiles))
+
+
+if __name__ == __main__:
+
+parser = argparse.ArgumentParser('hid for ui consistency parser')
+parser.add_argument('-s', '--send-to', action='append', help='email
address to send the report to. Use one flag per address.', required=False)
+parser.add_argument('-g', '--git-static', action='store_true', help='to
avoid contacting remote server to refresh repositories.', required=False)
+parser.add_argument('-r', '--core-repo-dir', help='enforce path to core
repository when analyzing .ui files.', required=False)
+args=vars(parser.parse_args())
+
+rows = init_hids().splitlines()
+#tree:relative_file:text
+# handled as sets to remove duplicates (and we don't need an iterator)
+targets = collections.defaultdict(set)
+origin = collections.defaultdict(set)
+
+# fill all matching hids and their parent file
+for row in rows:
+fname, rawtext = row.split(':',2)[1:]
+hid = rawtext.split('hid=')[1].split('')[0]
+if hid.startswith('.uno'): continue
+uifileraw, compname = hid.rsplit('/',1)
+uifile = uifileraw.split('/',1)[1] + .ui # remove modules/ which
exist only in install
+targets[uifile].add(compname.split(':')[0])
+origin[uifile].add(fname) # help file(s)
+
+uifileslist = init_core_files()
+# allfiles = init_core_files()
+# uifileslist = '\n'.join(re.findall('.*\.ui',allfiles))
+errors = ''
+# search in all .ui files referenced in help
+# 2 possible errors: file not found in repo, id not found in file
+for uikey in dict.keys(targets):
+if uikey not in uifileslist:
+if len(origin[uikey]) == 1:
+errors += '\nFrom ' + origin[uikey].pop()
+else:
+errors += '\nFrom one of ' +
str(origin[uikey]).replace('set(','').replace(')','')
+errors += ', we did not found file '+ uikey+'.'
+continue
+
+full_path =
os.path.join(core_repo_dir,re.search('(.*'+uikey+')',uifileslist).group(1))
+# print full_path
+root = ET.parse(full_path).getroot()
+ids = [element.attrib['id'].split(':')[0] for element in
root.findall('.//object[@id]') ]
+# print targets[uikey]
+missing_ids = [ element for element in targets[uikey] if element not
in ids ]
+if missing_ids:
+if
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/a11yrolehelper.mm |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 44a6c8eed837ab5e82b9db5e8138a94bd161a4ea Author: Niklas Johansson sleeping.pil...@gmail.com Date: Thu Mar 20 18:27:39 2014 +0100 Improve Accessibility mapping of roles for Mac Since role Heading now is exposed to A11y we need to give it a better role then unknown, otherwise it gets inaccessible to VoiceOver. Until I get a better grip on how to best expose AXHeading, let's map it to textAreaRole so we at least get back to the behaviour before IA2 integration. Header and Footer is probably best mapped to AXGroup. Change-Id: I6353f4d25c18e6e550df289ca2e999ad1c01f2a8 Reviewed-on: https://gerrit.libreoffice.org/8682 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/osx/a11yrolehelper.mm b/vcl/osx/a11yrolehelper.mm index ae2391f..45423db 100644 --- a/vcl/osx/a11yrolehelper.mm +++ b/vcl/osx/a11yrolehelper.mm @@ -59,14 +59,14 @@ using namespace ::com::sun::star::uno; MAP( AccessibleRole::FILE_CHOOSER, NSAccessibilityUnknownRole ); // FIXME MAP( AccessibleRole::FILLER, NSAccessibilityUnknownRole ); // FIXME MAP( AccessibleRole::FONT_CHOOSER, NSAccessibilityUnknownRole ); // FIXME -MAP( AccessibleRole::FOOTER, NSAccessibilityUnknownRole ); // FIXME +MAP( AccessibleRole::FOOTER, NSAccessibilityGroupRole ); // FIXME MAP( AccessibleRole::FOOTNOTE, NSAccessibilityUnknownRole ); // FIXME MAP( AccessibleRole::FRAME, NSAccessibilityWindowRole ); MAP( AccessibleRole::GLASS_PANE, NSAccessibilityUnknownRole ); // FIXME MAP( AccessibleRole::GRAPHIC, NSAccessibilityImageRole ); MAP( AccessibleRole::GROUP_BOX, NSAccessibilityGroupRole ); -MAP( AccessibleRole::HEADER, NSAccessibilityUnknownRole ); // FIXME -MAP( AccessibleRole::HEADING, NSAccessibilityUnknownRole ); // FIXME +MAP( AccessibleRole::HEADER, NSAccessibilityGroupRole ); // FIXME +MAP( AccessibleRole::HEADING, NSAccessibilityTextAreaRole ); // FIXME MAP( AccessibleRole::HYPER_LINK, NSAccessibilityLinkRole ); MAP( AccessibleRole::ICON, NSAccessibilityImageRole ); MAP( AccessibleRole::INTERNAL_FRAME, NSAccessibilityUnknownRole ); // FIXME ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - framework/source
framework/source/services/autorecovery.cxx |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit f9be1da8203d610a038732c6c8a80206b038fa79 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Mar 14 09:42:02 2014 +0100 fdo#51819: autorecovery: fix saving password in protected documents. Thanks to s...@mailinator.com for the idea. (cherry picked from commit ef87ff6680f79362a431db6e7ef2f40cfc576219) Conflicts: framework/source/services/autorecovery.cxx Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c Reviewed-on: https://gerrit.libreoffice.org/8681 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9541000..2136538 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2333,9 +2333,11 @@ void AutoRecovery::implts_saveOneDoc(const OUString // if the document was loaded with a password, it should be // stored with password ::comphelper::MediaDescriptor lNewArgs; -OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), OUString()); -if (!sPassword.isEmpty()) -lNewArgs[::comphelper::MediaDescriptor::PROP_PASSWORD()] = sPassword; +css::uno::Sequence css::beans::NamedValue aEncryptionData = + lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_ENCRYPTIONDATA(), +css::uno::Sequence css::beans::NamedValue ()); +if (aEncryptionData.getLength() 0) +lNewArgs[::comphelper::MediaDescriptor::PROP_ENCRYPTIONDATA()] = aEncryptionData; // Further it must be saved using the default file format of that application. // Otherwhise we will some data lost. ___ 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/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit b22fbeb70719110eb7b8774fe96092e66861460a
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 11:12:44 2014 +
coverity#736084 Missing break in switch
Change-Id: I3c7a032441402455d0a6ed28fc2cd5ce958ead04
(cherry picked from commit 5c291a0287af46558d3ef96d18b114c371ddd31b)
Reviewed-on: https://gerrit.libreoffice.org/8690
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 54b6927..5078491 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2666,11 +2666,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
RTFValue::Pointer_t pValue(new RTFValue(1));
m_aStates.top().aTableRowSprms.set(NS_sprm::LN_TCantSplit,
pValue);
}
+break;
case RTF_SECTUNLOCKED:
{
RTFValue::Pointer_t pValue(new RTFValue(!nParam));
m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_formProt,
pValue);
}
+break;
case RTF_PGNDEC:
case RTF_PGNUCRM:
case RTF_PGNLCRM:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f2130cea98f6c9ce7c90207828f5d0c7ec3e4020 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 11:39:30 2014 + Updated core Project: help cba805e15a2ac1cfaf3004b63ef20ad797926939 diff --git a/helpcontent2 b/helpcontent2 index 8b9f7ab..cba805e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8b9f7abb275c3b3f9f3e7ed4715d63111b23a690 +Subproject commit cba805e15a2ac1cfaf3004b63ef20ad797926939 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner ||target:4.3.0 --- Comment #7 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=cba805e15a2ac1cfaf3004b63ef20ad797926939 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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] help.git: source/text
source/text/shared/optionen/01010700.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cba805e15a2ac1cfaf3004b63ef20ad797926939 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 11:39:30 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: I66be81e9d8ad2c6193cf6467c08fc9172235112a diff --git a/source/text/shared/optionen/01010700.xhp b/source/text/shared/optionen/01010700.xhp index 553a95d..2e0265c 100644 --- a/source/text/shared/optionen/01010700.xhp +++ b/source/text/shared/optionen/01010700.xhp @@ -151,7 +151,7 @@ paragraph role=paragraph id=par_id3146990 xml-lang=en-US l10n=U oldref=55ahelp hid=cui/ui/optfontspage/fontnameSelect the font for the display of HTML and Basic source code./ahelp Select emphAutomatic/emph to detect a suitable font automatically./paragraph bookmark xml-lang=en-US branch=hid/cui/ui/optfontspage/nonpropfontonly id=bm_id1382183 localize=false/ paragraph role=heading id=hd_id3146791 xml-lang=en-US level=3 l10n=U oldref=56Non-proportional fonts only/paragraph -paragraph role=paragraph id=par_id3154362 xml-lang=en-US l10n=U oldref=57ahelp hid=cui/ui/optfontspage/nonpropfontonlCheck to display only non-proportional fonts in the emphFonts/emph list box./ahelp/paragraph +paragraph role=paragraph id=par_id3154362 xml-lang=en-US l10n=U oldref=57ahelp hid=cui/ui/optfontspage/nonpropfontonlyCheck to display only non-proportional fonts in the emphFonts/emph list box./ahelp/paragraph bookmark xml-lang=en-US branch=hid/cui/ui/optfontspage/fontheight id=bm_id6423841 localize=false/ paragraph role=heading id=hd_id3153765 xml-lang=en-US level=3 l10n=U oldref=58Size/paragraph paragraph role=paragraph id=par_id3150323 xml-lang=en-US l10n=U oldref=59ahelp hid=cui/ui/optfontspage/fontheightSelect a font size for the display of HTML and Basic source code./ahelp/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/04120222.xhp |2 +- source/text/swriter/01/04120227.xhp |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e4b149ab0749be72cfb6acfcea01c0cf296fe6cc Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 11:42:53 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: Ic1ee030ded8eef172dc9c6f2af817404987e84c8 diff --git a/source/text/swriter/01/04120222.xhp b/source/text/swriter/01/04120222.xhp index 779f507..6389cf3 100644 --- a/source/text/swriter/01/04120222.xhp +++ b/source/text/swriter/01/04120222.xhp @@ -58,6 +58,6 @@ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/alphadelim id=bm_id3147094 localize=false/paragraph role=heading id=hd_id3148977 xml-lang=en-US level=3 l10n=U oldref=10Alphabetical delimiter/paragraph paragraph role=paragraph id=par_id3147100 xml-lang=en-US l10n=U oldref=11ahelp hid=modules/swriter/ui/tocentriespage/alphadelimUses the initial letters of the alphabetically arranged index entries as section headings./ahelp/paragraph bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/commasep id=bm_id3149043 localize=false/paragraph role=heading id=hd_id3147226 xml-lang=en-US level=3 l10n=U oldref=12Key separated by commas/paragraph -paragraph role=paragraph id=par_id3153631 xml-lang=en-US l10n=U oldref=13ahelp hid=modules/swriter/ui/tocentriespage/comasepArranges the index entries on the same line, separated by commas./ahelp/paragraph +paragraph role=paragraph id=par_id3153631 xml-lang=en-US l10n=U oldref=13ahelp hid=modules/swriter/ui/tocentriespage/commasepArranges the index entries on the same line, separated by commas./ahelp/paragraph /body /helpdocument diff --git a/source/text/swriter/01/04120227.xhp b/source/text/swriter/01/04120227.xhp index 7c558fc..df79979 100644 --- a/source/text/swriter/01/04120227.xhp +++ b/source/text/swriter/01/04120227.xhp @@ -50,8 +50,8 @@ paragraph role=paragraph id=par_id3154482 xml-lang=en-US l10n=U oldref=11Specify the sorting options for the bibliography entries./paragraph bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/sortpos id=bm_id3153677 localize=false/paragraph role=heading id=hd_id3153665 xml-lang=en-US level=3 l10n=U oldref=12Document position/paragraph paragraph role=paragraph id=par_id3151314 xml-lang=en-US l10n=U oldref=13ahelp hid=modules/swriter/ui/tocentriespage/sortposSorts the bibliography entries according to the position of their references in the document./ahelp Select this option if you want to use automatically numbered references./paragraph -bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/sortcontent id=bm_id3155902 localize=false/paragraph role=heading id=hd_id3154576 xml-lang=en-US level=3 l10n=U oldref=14Content/paragraph -paragraph role=paragraph id=par_id3149687 xml-lang=en-US l10n=U oldref=15ahelp hid=modules/swriter/ui/tocentriespage/sortcontentSorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/sortcontents id=bm_id3155902 localize=false/paragraph role=heading id=hd_id3154576 xml-lang=en-US level=3 l10n=U oldref=14Content/paragraph +paragraph role=paragraph id=par_id3149687 xml-lang=en-US l10n=U oldref=15ahelp hid=modules/swriter/ui/tocentriespage/sortcontentsSorts the bibliography entries by the Sort keys that you specify, for example, by author or by year of publication./ahelp/paragraph paragraph role=heading id=hd_id3155175 xml-lang=en-US level=2 l10n=U oldref=16Sort keys/paragraph bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/key1lb id=bm_id3143281 localize=false/ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/key2lb id=bm_id3149481 localize=false/ @@ -64,6 +64,6 @@ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/down1cb id=bm_id3147221 localize=false/ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/down2cb id=bm_id3147225 localize=false/ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/tocentriespage/down3cb id=bm_id3149035 localize=false/paragraph role=heading id=hd_id3148981 xml-lang=en-US level=3 l10n=U oldref=22ZA/paragraph -paragraph role=paragraph id=par_id3149041 xml-lang=en-US l10n=U oldref=23ahelp hid=modules/swriter/ui/tocentriespage/downSorts the bibliography entries in a descending alphanumerical order./ahelp/paragraph +paragraph role=paragraph id=par_id3149041 xml-lang=en-US l10n=U oldref=23ahelp hid=modules/swriter/ui/tocentriespage/down3cbSorts the bibliography entries in a descending alphanumerical order./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 988a2d2fb2879a374e4eb76132eb98ec4512c8af Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 11:42:53 2014 + Updated core Project: help e4b149ab0749be72cfb6acfcea01c0cf296fe6cc diff --git a/helpcontent2 b/helpcontent2 index cba805e..e4b149a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cba805e15a2ac1cfaf3004b63ef20ad797926939 +Subproject commit e4b149ab0749be72cfb6acfcea01c0cf296fe6cc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce03500beb8b99e5336eadc0f448a76bcc96e64b Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 11:43:43 2014 + Updated core Project: help a193d80ec52e7e90015b4ab59c533dbd04d1c7e9 diff --git a/helpcontent2 b/helpcontent2 index e4b149a..a193d80 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e4b149ab0749be72cfb6acfcea01c0cf296fe6cc +Subproject commit a193d80ec52e7e90015b4ab59c533dbd04d1c7e9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/12030100.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a193d80ec52e7e90015b4ab59c533dbd04d1c7e9 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 11:43:43 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: I7d077b0bf163be52913de0ff4ed05ca0e23282da diff --git a/source/text/scalc/01/12030100.xhp b/source/text/scalc/01/12030100.xhp index be840ab..23cb6bd 100644 --- a/source/text/scalc/01/12030100.xhp +++ b/source/text/scalc/01/12030100.xhp @@ -32,8 +32,8 @@ section id=sortierkriterien bookmark xml-lang=en-US branch=index id=bm_id3152350bookmark_valuesorting; sort criteria for database ranges/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/modules/scalc/ui/sortcriteria/SortCriteriaPage id=bm_id3156326 localize=false/paragraph role=heading id=hd_id3152350 xml-lang=en-US level=1 l10n=U oldref=1link href=text/scalc/01/12030100.xhp name=Sort CriteriaSort Criteria/link/paragraph -paragraph role=paragraph id=par_id3151385 xml-lang=en-US l10n=U oldref=2ahelp hid=modules/scalc/ui/sortcriteria/SortCriteriaPageSpecify the sorting options for the selected range./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/sortcriteriapage/SortCriteriaPage id=bm_id3156326 localize=false/paragraph role=heading id=hd_id3152350 xml-lang=en-US level=1 l10n=U oldref=1link href=text/scalc/01/12030100.xhp name=Sort CriteriaSort Criteria/link/paragraph +paragraph role=paragraph id=par_id3151385 xml-lang=en-US l10n=U oldref=2ahelp hid=modules/scalc/ui/sortcriteriapage/SortCriteriaPageSpecify the sorting options for the selected range./ahelp/paragraph /section paragraph role=note id=par_id3152462 xml-lang=en-US l10n=U oldref=24Ensure that you include any row and column titles in the selection./paragraph section id=howtoget ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #8 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=e4b149ab0749be72cfb6acfcea01c0cf296fe6cc Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #9 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=a193d80ec52e7e90015b4ab59c533dbd04d1c7e9 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: vcl/generic
vcl/generic/print/prtsetup.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eac72c2197d9b772d147c31d5737d511a82d9bb8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 11:46:53 2014 +
WaE: -Werror=conversion-null
Change-Id: I56380e87c82f785f231b04d2e1b340bb667c59d9
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index ce1f655..2cb770f 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -473,7 +473,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
int SetupPrinterDriver(::psp::PrinterInfo rJobData)
{
int nRet = 0;
-RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, false );
+RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, NULL );
if( aDialog.Execute() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 +++
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |4 ++--
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |2 +-
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx |4 ++--
writerfilter/source/ooxml/OOXMLParserState.cxx |4 ++--
writerfilter/source/ooxml/OOXMLParserState.hxx |8
6 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 359a7d4b7fe3ea2c8f18d1f2b4a17c60ac42ae1d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Mar 21 12:40:40 2014 +0100
Remove unnecessary dynamic_cast
OOXMLDocumentImpl is the only implementation of OOXMLDocument, though
code outside the ooxml directory has no access to OOXMLDocumentImpl.
However, in that directory passing OOXMLDocumentImpl* as OOXMLDocument*,
then using dynamic_cast to get back OOXMLDocumentImpl* is quite
pointless.
Change-Id: I06dcf85180def1db33b57bd356749f5d92aefa80
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index b735441..ce4b3a9 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -558,8 +558,7 @@ void OOXMLFastContextHandler::setParent
OOXMLPropertySet * OOXMLFastContextHandler::getPicturePropSet
(const OUString rId)
{
-return dynamic_castOOXMLDocumentImpl *(mpParserState-getDocument())-
-getPicturePropSet(rId);
+return mpParserState-getDocument()-getPicturePropSet(rId);
}
void OOXMLFastContextHandler::sendTableDepth() const
@@ -1148,12 +1147,12 @@ void OOXMLFastContextHandler::setDefaultStringValue()
{
}
-void OOXMLFastContextHandler::setDocument(OOXMLDocument * pDocument)
+void OOXMLFastContextHandler::setDocument(OOXMLDocumentImpl* pDocument)
{
mpParserState-setDocument(pDocument);
}
-OOXMLDocument * OOXMLFastContextHandler::getDocument()
+OOXMLDocumentImpl* OOXMLFastContextHandler::getDocument()
{
return mpParserState-getDocument();
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 9217da6..c7e7729 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -168,8 +168,8 @@ public:
(Token_t Element,
const uno::Reference xml::sax::XFastAttributeList Attribs);
-void setDocument(OOXMLDocument * pDocument);
-OOXMLDocument * getDocument();
+void setDocument(OOXMLDocumentImpl* pDocument);
+OOXMLDocumentImpl* getDocument();
void setXNoteId(OOXMLValue::Pointer_t pValue);
void setXNoteId(const sal_Int32 nId);
sal_Int32 getXNoteId() const;
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 4df3596..4ac9f80 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -38,7 +38,7 @@ using namespace ::std;
OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
uno::Reference uno::XComponentContext const context,
Stream* pStream,
-OOXMLDocument* pDocument,
+OOXMLDocumentImpl* pDocument,
sal_Int32 nXNoteId )
: m_xContext(context)
, mpStream( pStream )
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 00cf859..78aa358 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -43,7 +43,7 @@ public:
OOXMLFastDocumentHandler(
uno::Reference uno::XComponentContext const context,
Stream* pStream,
-OOXMLDocument* pDocument,
+OOXMLDocumentImpl* pDocument,
sal_Int32 nXNoteId );
virtual ~OOXMLFastDocumentHandler() {}
@@ -98,7 +98,7 @@ private:
#ifdef DEBUG_ELEMENT
Stream::Pointer_t mpTmpStream;
#endif
-OOXMLDocument * mpDocument;
+OOXMLDocumentImpl* mpDocument;
sal_Int32 mnXNoteId;
mutable boost::shared_ptrOOXMLFastContextHandler mpContextHandler;
boost::shared_ptrOOXMLFastContextHandler getContextHandler() const;
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index d8b562b..235e089 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -113,12 +113,12 @@ void OOXMLParserState::setHandle()
mnHandle = mnContexts;
}
-void OOXMLParserState::setDocument(OOXMLDocument * pDocument)
+void OOXMLParserState::setDocument(OOXMLDocumentImpl* pDocument)
{
mpDocument = pDocument;
}
-OOXMLDocument * OOXMLParserState::getDocument() const
+OOXMLDocumentImpl* OOXMLParserState::getDocument() const
{
return mpDocument;
}
diff --git
Re: GSOC application disscusion
Hi Arnav, On Fri, Mar 21, 2014 at 10:31:14AM +, Arnav Singh arnav...@gmail.com wrote: sir my proposal is ready but i wanted to discuss some points... sir i havent done much of the open source programming...athough i am good with languages and done some system programming as well... does that effect my selection for the project..?? I'm not sure you read my reply. :-) The #1 requirement is a solved easy hack. Once that's done, we can discuss your proposal. Pick up a nontrivial one from here: https://wiki.documentfoundation.org/Development/Easy_Hacks#Lists_of_Easy_Hacks Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git:
0 files changed New commits: commit 9352b14adeaa7050f35894e1abc14d46be737ad5 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 12:02:25 2014 + Updated core Project: help 440af54dcae5a9380810ba81b68bdf198730423b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2 include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk
helpcontent2 |2
include/svx/dialogs.hrc |2
include/svx/fontworkgallery.hxx |9 --
svx/UIConfig_svx.mk |1
svx/inc/fontworkgallery.hrc |9 --
svx/inc/helpid.hrc |1
svx/source/tbxctrls/fontworkgallery.cxx | 36 -
svx/source/tbxctrls/fontworkgallery.src | 61 ---
svx/uiconfig/ui/fontworkgallerydialog.ui | 124 +++
9 files changed, 145 insertions(+), 100 deletions(-)
New commits:
commit 7209372b00ad922e6e398c0a92dd098cca1d436a
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Fri Mar 21 11:34:55 2014 +0100
Convert RID_SVX_MDLG_FONTWORK_GALLERY to .ui
Change-Id: I18c02b6c1f9ea9642d3f04092f7df4dcc9d92990
Reviewed-on: https://gerrit.libreoffice.org/8689
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/helpcontent2 b/helpcontent2
index a193d80..440af54 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a193d80ec52e7e90015b4ab59c533dbd04d1c7e9
+Subproject commit 440af54dcae5a9380810ba81b68bdf198730423b
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 3fddc02..7687f94 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1008,8 +1008,6 @@
// ModalDialog resource ids
-#define RID_SVX_MDLG_FONTWORK_GALLERY ( RID_SVX_START + 2 )
-
// Menu resource ids
#define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 )
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index d792b13..a5b63ba 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -77,19 +77,14 @@ public:
class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
{
-FixedLine maFLFavorites;
-ValueSetmaCtlFavorites;
-OKButtonmaOKButton;
-CancelButtonmaCancelButton;
-HelpButton maHelpButton;
+ValueSet* mpCtlFavorites;
+OKButton* mpOKButton;
sal_uInt16 mnThemeId;
SdrView*mpSdrView;
FmFormModel*mpModel;
-OUStringmaStrClickToAddText;
-
DECL_LINK( DoubleClickFavoriteHdl, void * );
DECL_LINK( ClickOKHdl, void * );
DECL_LINK( ClickTextDirectionHdl, ImageButton * );
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 7311698..8f30b32 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/extrustiondepthdialog \
svx/uiconfig/ui/findreplacedialog \
+ svx/uiconfig/ui/fontworkgallerydialog \
svx/uiconfig/ui/fontworkspacingdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/linkwarndialog \
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index 4946a8c..115abb4 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
@@ -18,15 +18,6 @@
*/
#include svx/dialogs.hrc
-#define FL_FAVORITES1
-#define CTL_FAVORITES 2
-#define BTN_OK 3
-#define BTN_CANCEL 4
-#define BTN_HELP9
-
-#define STR_CLICK_TO_ADD_TEXT 1
-
-
#define STR_ALIGN_LEFT 1
#define STR_ALIGN_CENTER2
#define STR_ALIGN_RIGHT 3
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 0c1f040..c868e8c 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -44,7 +44,6 @@
#define HID_CONTDLG_TOOLBOX
SVX_HID_CONTDLG_TOOLBOX
#define HID_CONTDLG_UNDO
SVX_HID_CONTDLG_UNDO
#define HID_CONTDLG_WORKPLACE
SVX_HID_CONTDLG_WORKPLACE
-#define HID_CTL_FONTWORK_FAVORITES
SVX_HID_CTL_FONTWORK_FAVORITES
#define HID_CTRL3D_HSCROLL
SVX_HID_CTRL3D_HSCROLL
#define HID_CTRL3D_SWITCHER
SVX_HID_CTRL3D_SWITCHER
#define HID_CTRL3D_VSCROLL
SVX_HID_CTRL3D_VSCROLL
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index 29cfb35..ea03126 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -72,27 +72,25 @@ const int nLineCount = 4;
|* Svx3DWin - FloatingWindow
\/
FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window*
pParent, sal_uInt16 /*nSID*/ ) :
-ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_FONTWORK_GALLERY ) ),
-maFLFavorites ( this, SVX_RES( FL_FAVORITES ) ),
-maCtlFavorites ( this, SVX_RES( CTL_FAVORITES ) ),
-maOKButton (
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |2 -- source/text/shared/guide/fontwork.xhp |7 --- 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit 440af54dcae5a9380810ba81b68bdf198730423b Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 12:02:25 2014 + update help ids for fontwork gallery .ui conversion Change-Id: Ie708d0c5558d954afc7204f6e14b4fdde1dfa284 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 2e733bb..a0a6ea3 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1083,7 +1083,6 @@ HID_CONTDLG_WORKPLACE,33919, HID_CONTROLS_DATE_N_TIME,38194, HID_CTL_ACTION_DLG_1,59870, HID_CTL_ACTION_DLG_2,59871, -HID_CTL_FONTWORK_FAVORITES,33862, HID_CTL_QRYDGNCRIT,38861, HID_CTL_QRYDGNTAB,38854, HID_CTL_QRYSQLEDIT,38839, @@ -6224,7 +6223,6 @@ svx_ModalDialog_RID_OFADLG_OPTIONS_TREE_HINT,1346011136, svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872, svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224, svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744, -svx_ModalDialog_RID_SVX_MDLG_FONTWORK_GALLERY,1237614592, svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336, svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448, svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701, diff --git a/source/text/shared/guide/fontwork.xhp b/source/text/shared/guide/fontwork.xhp index 470c191..d7b4be6 100644 --- a/source/text/shared/guide/fontwork.xhp +++ b/source/text/shared/guide/fontwork.xhp @@ -39,7 +39,8 @@ bookmark_valuerotating;3D text/bookmark_value bookmark_valueediting;Fontwork objects/bookmark_value bookmark_valueinserting;Fontwork objects/bookmark_value -/bookmarkcommentMW changed adding; to inserting;/comment +/bookmark +bookmark xml-lang=en-US branch=hid/svx/ui/fontworkgallerydialog/FontworkGalleryDialog id=bm_id3156416 localize=false/ paragraph xml-lang=en-US id=par_idN1066D role=heading level=1 l10n=NEWvariable id=fontworklink href=text/shared/guide/fontwork.xhpFontwork For Graphical Text Art/link /variable/paragraph paragraph xml-lang=en-US id=par_idN1068B role=paragraph l10n=NEWYou can use Fontwork to create graphical text art objects./paragraph @@ -55,7 +56,7 @@ /listitem listitem -bookmark xml-lang=en-US branch=hid/SVX_HID_CTL_FONTWORK_FAVORITES id=bm_id3156415 localize=false/ +bookmark xml-lang=en-US branch=hid/svx/ui/fontworkgallerydialog/ctlFavorites id=bm_id3156415 localize=false/ paragraph role=paragraph id=par_id3149761 xml-lang=en-US l10n=U oldref=55ahelp hid=. visibility=hiddenSelect a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text./ahelp/paragraph paragraph xml-lang=en-US id=par_idN106A0 role=paragraph l10n=NEWIn the emphFontwork Gallery/emph dialog, select a Fontwork style and click OK./paragraph @@ -113,4 +114,4 @@ embed href=text/shared/01/0528.xhp#fntwrk/ /section /body -/helpdocument \ No newline at end of file +/helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - include/svx include/vcl sd/source svx/Library_svxcore.mk svx/source vcl/source
include/svx/sdr/contact/viewcontactofopengl.hxx | 35 --
include/svx/sdr/contact/viewcontactofopenglobj.hxx| 37 +++
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx | 39 +++
include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx | 14 +++-
include/svx/svdoopengl.hxx|4 -
include/vcl/OpenGLContext.hxx |2
sd/source/ui/func/fuinsfil.cxx|2
svx/Library_svxcore.mk|5 +
svx/source/sdr/contact/viewcontactofopengl.cxx| 38 ---
svx/source/sdr/contact/viewcontactofopenglobj.cxx | 44 +
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx | 47 ++
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 26 +--
svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx | 22 ++
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 37 +--
vcl/source/opengl/OpenGLContext.cxx |4 -
15 files changed, 222 insertions(+), 134 deletions(-)
New commits:
commit d834be0dac2b455076e0c0824f8e6a6e709625ac
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Mar 21 14:00:56 2014 +0100
Init an opengl context bounded to an existent window.
Via ViewObjectContact can we query a window.
It seems this window is the same which is used
by chart edit mode.
Change-Id: Ib6df4d58730774f3d86b453b8174a78bb2c8a45b
diff --git a/include/svx/sdr/contact/viewcontactofopenglobj.hxx
b/include/svx/sdr/contact/viewcontactofopenglobj.hxx
index 0ac95ce..6b48e66 100644
--- a/include/svx/sdr/contact/viewcontactofopenglobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofopenglobj.hxx
@@ -24,6 +24,8 @@ public:
virtual ~ViewContactOfOpenGLObj();
protected:
+virtual ViewObjectContact
CreateObjectSpecificViewObjectContact(ObjectContact rObjectContact);
+
virtual drawinglayer::primitive2d::Primitive2DSequence
createViewIndependentPrimitive2DSequence() const;
};
diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
new file mode 100644
index 000..00e1dff
--- /dev/null
+++ b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
+
+#include svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+#include vcl/OpenGLContext.hxx
+
+class Window;
+
+namespace sdr {
+namespace contact {
+
+class ViewObjectContactOfOpenGLObj : public ViewObjectContactOfSdrObj
+{
+public:
+ViewObjectContactOfOpenGLObj(ObjectContact rObjectContact, ViewContact
rViewContact);
+virtual ~ViewObjectContactOfOpenGLObj();
+
+protected:
+Window* getWindow() const;
+
+private:
+OpenGLContext m_aOpenGLContext;
+};
+
+} // namespace sdr
+} // namespace contact
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx
index 390c3df..82145b4 100644
--- a/include/vcl/OpenGLContext.hxx
+++ b/include/vcl/OpenGLContext.hxx
@@ -99,7 +99,7 @@ public:
OpenGLContext();
~OpenGLContext();
-bool init();
+bool init(Window* pParent = 0);
void setWinSize(const Size rSize);
GLWindow getOpenGLWindow();
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 39f15b2..d025cdf 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
utl \
vcl \
xo \
+vclopengl \
$(gb_UWINAPI) \
))
@@ -82,6 +83,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \
icuuc \
icu_headers \
+ glew \
))
$(eval $(call gb_Library_add_exception_objects,svxcore,\
@@ -194,6 +196,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/sdr/contact/viewcontactofsdrmeasureobj \
svx/source/sdr/contact/objectcontactofobjlistpainter \
svx/source/sdr/contact/viewobjectcontactofe3d \
+svx/source/sdr/contact/viewobjectcontactofopenglobj \
svx/source/sdr/event/eventhandler \
svx/source/sdr/overlay/overlayline \
svx/source/sdr/overlay/overlaycrosshair \
diff --git a/svx/source/sdr/contact/viewcontactofopenglobj.cxx
b/svx/source/sdr/contact/viewcontactofopenglobj.cxx
index 25d5ef2..ef2c32a 100644
--- a/svx/source/sdr/contact/viewcontactofopenglobj.cxx
+++
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #10 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=1c838635c1815acecafb0c6634d67515ba475ced Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67712, which changed state. Bug 67712 Summary: FORMCONTROLS: anchored to cell but changes position after reopening https://bugs.freedesktop.org/show_bug.cgi?id=67712 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c49783e18787e55d93d0d14492aab50030302625 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 13:08:06 2014 + Updated core Project: help 1c838635c1815acecafb0c6634d67515ba475ced diff --git a/helpcontent2 b/helpcontent2 index 440af54..1c83863 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 440af54dcae5a9380810ba81b68bdf198730423b +Subproject commit 1c838635c1815acecafb0c6634d67515ba475ced ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/Library_svxcore.mk
svx/Library_svxcore.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 48044571776374643b9d631dd220e6d0a00b51dc Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Mar 21 14:17:41 2014 +0100 Try to fix win build: cant open GL/glext.h include Change-Id: I2c4bb2831e12ff45d56335ab17561ea9cf5e9921 diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index d025cdf..0aaa506 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\ boost_headers \ icuuc \ icu_headers \ + mesa_headers \ glew \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6fe2c9a41a7ae54bec0266968e9cc7e76fbd4a7 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 13:31:14 2014 + Updated core Project: help 7182afe0322254178ed9b6096a62c9cc8c6f3b62 diff --git a/helpcontent2 b/helpcontent2 index 1c83863..7182afe 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1c838635c1815acecafb0c6634d67515ba475ced +Subproject commit 7182afe0322254178ed9b6096a62c9cc8c6f3b62 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 3 commits - source/text
source/text/scalc/01/12090101.xhp |2 +- source/text/shared/01/05210300.xhp |2 +- source/text/smath/01/0501.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 7182afe0322254178ed9b6096a62c9cc8c6f3b62 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 13:31:14 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: I9a45f3845080dfe05e47a389c43e8a0ee6fdedbe diff --git a/source/text/shared/01/05210300.xhp b/source/text/shared/01/05210300.xhp index 8edb6ae..49c1be8 100644 --- a/source/text/shared/01/05210300.xhp +++ b/source/text/shared/01/05210300.xhp @@ -81,7 +81,7 @@ paragraph xml-lang=en-US id=hd_id3155341 role=heading level=2 l10n=U oldref=31Load Gradients List/paragraph paragraph xml-lang=en-US id=par_id3145085 role=paragraph l10n=U oldref=32ahelp hid=cui/ui/gradientpage/loadLoad a different list of gradients./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui/ui/grdientpage/save id=bm_id3145609 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/gradientpage/save id=bm_id3145609 localize=false/ paragraph xml-lang=en-US id=hd_id3148943 role=heading level=2 l10n=U oldref=33Save Gradients List/paragraph paragraph xml-lang=en-US id=par_id3161459 role=paragraph l10n=U oldref=34ahelp hid=cui/ui/gradientpage/saveSaves the current list of gradients, so that you can load it later./ahelp/paragraph commit 8a29d34fec7d051bed1f2d47fea39455043c456a Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 13:30:00 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: I5c264334c59e3b080bc57f7829aa7a19217b7765 diff --git a/source/text/smath/01/0501.xhp b/source/text/smath/01/0501.xhp index bd30bad..08dce70 100644 --- a/source/text/smath/01/0501.xhp +++ b/source/text/smath/01/0501.xhp @@ -37,7 +37,7 @@ dedr: fixed #i30893#/lastedited bookmark_valuedefining; formula fonts/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/.uno:ChangeFont id=bm_id3153925 localize=false/ -bookmark xml-lang=en-US branch=hid/modules/smath/ui/fonttypedialog/FontTypeDialog id=bm_id3153926 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/smath/ui/fonttypedialog/FontsDialog id=bm_id3153926 localize=false/ paragraph role=heading id=hd_id3156261 xml-lang=en-US level=1 l10n=U oldref=1Fonts/paragraph paragraph role=paragraph id=par_id3153716 xml-lang=en-US l10n=U oldref=2variable id=schriftartentextahelp hid=modules/smath/ui/fonttypedialog/FontTypeDialogDefines the fonts that can be applied to formula elements./ahelp /variable/paragraph commit 8af55c32f7b639ad95ea753d7a6c2c4276eee1ec Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 13:28:34 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: I5239a429359c810b0bf42e711c9e459968eae973 diff --git a/source/text/scalc/01/12090101.xhp b/source/text/scalc/01/12090101.xhp index a158f93..2dd4fb3 100644 --- a/source/text/scalc/01/12090101.xhp +++ b/source/text/scalc/01/12090101.xhp @@ -43,7 +43,7 @@ paragraph role=paragraph id=par_id3125863 xml-lang=en-US l10n=CHG oldref=4ahelp hid=.You can only select databases that are registered in %PRODUCTNAME./ahelp To register a data source, choose emphswitchinline select=syscaseinline select=MAC%PRODUCTNAME - Preferences/caseinlinedefaultinlineTools - Options/defaultinline/switchinline - %PRODUCTNAME Base - Databases/emph./paragraph bookmark xml-lang=en-US branch=hid/modules/scalc/ui/selectdatasource/database id=bm_id3154684 localize=false/ paragraph role=heading id=hd_id3151041 xml-lang=en-US level=3 l10n=U oldref=5Database/paragraph -paragraph role=paragraph id=par_id3156424 xml-lang=en-US l10n=U oldref=6ahelp hid=modules/scalc/ui/selectdatasource/databasSelect the database that contains the data source that you want to use./ahelp/paragraph +paragraph role=paragraph id=par_id3156424 xml-lang=en-US l10n=U oldref=6ahelp hid=modules/scalc/ui/selectdatasource/databaseSelect the database that contains the data source that you want to use./ahelp/paragraph bookmark xml-lang=en-US branch=hid/modules/scalc/ui/selectdatasource/datasource id=bm_id3151112 localize=false/ paragraph role=heading id=hd_id3145364 xml-lang=en-US level=3 l10n=U oldref=7Data source/paragraph paragraph role=paragraph id=par_id3149260 xml-lang=en-US l10n=U oldref=8ahelp hid=modules/scalc/ui/selectdatasource/datasourceSelect the data source that you want to use./ahelp/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=8af55c32f7b639ad95ea753d7a6c2c4276eee1ec Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #12 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=8a29d34fec7d051bed1f2d47fea39455043c456a Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #13 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=7182afe0322254178ed9b6096a62c9cc8c6f3b62 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: vcl/Library_vclopengl.mk
vcl/Library_vclopengl.mk |4 1 file changed, 4 insertions(+) New commits: commit 0dcb50f50c09b8c43dbfc4b7b401c4c037eace5b Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Mar 21 14:45:03 2014 +0100 Fix incostintent dll linkage warnings related with vclopengl lib Change-Id: I9c589e8890c3a824f13b1768021c7a6b0b658eee diff --git a/vcl/Library_vclopengl.mk b/vcl/Library_vclopengl.mk index 59cf958..793f09f 100644 --- a/vcl/Library_vclopengl.mk +++ b/vcl/Library_vclopengl.mk @@ -13,6 +13,10 @@ $(eval $(call gb_Library_set_include,vclopengl,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_add_defs,vclopengl,\ +-DVCLOPENGL_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_use_externals,vclopengl,\ boost_headers \ mdds_headers \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Help with Khmer Bug/Feature
Hello, It's been a while since I submitted a feature request here ( https://bugs.freedesktop.org/show_bug.cgi?id=59448), and I know that those capable of added such a feature are very busy, but I thought I would ask here to see if anyone would be willing to help. The feature request in a nutshell: Add an additional check-box option to turn off/on the ICU breakiterator in Options-Language Settings-Complex Text Layout if the current CTL language has the option for using the ICU breakitorator Default should be enabled. Reason for the feature request: Some minority languages use the Khmer script (but the words and grammar are completely different), and so the ICU breakitorator does not break the words correctly and makes using the current version of LibreOffice with those minority langauges impossible. Also, the ICU breakitorator for Khmer and Thai is not 100% accurate, and so those desiring to create documents that are 100% accurate by manually placing zero-width spaces between words cannot do so, because the ICU breakitorator breaks the manually broken words into smaller parts which are then incorrect (again because the ICU breakitorator is not 100% accurate). I don't think adding an additional check-box for CTL languages that have the ICU breakitorator enabled would cause any trouble, and would improve overall user experience. Thank you for your time and consideration, Nathan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/Library_svxcore.mk
svx/Library_svxcore.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 85bafd7abedbfc642309f0af850aede68000dba1 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Mar 21 15:21:28 2014 +0100 Fix android build Change-Id: Iee1d84e428a27917bbaaf0df95763794e9b4cca6 diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 0aaa506..b3c3521 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -75,7 +75,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ utl \ vcl \ xo \ -vclopengl \ +$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \ $(gb_UWINAPI) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table1.cxx | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 4d9ccf41db5f5860275ff62f7de7401512f72791
Author: Eike Rathke er...@redhat.com
Date: Fri Mar 21 15:20:02 2014 +0100
update enhanced protection ranges
Change-Id: I15eb63da7123f8c2bf9ae1b77fdd32289dba3636
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 552292d..0f71358 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1577,6 +1577,10 @@ void ScTable::UpdateReference(
if(mpCondFormatList)
mpCondFormatList-UpdateReference(rCxt);
+
+ScTableProtection* pProtection = GetProtection();
+if (pProtection)
+pProtection-updateReference( eUpdateRefMode, pDocument, rCxt.maRange,
nDx, nDy, nDz);
}
void ScTable::UpdateTranspose( const ScRange rSource, const ScAddress rDest,
@@ -1607,7 +1611,14 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext rCxt )
if (mpCondFormatList)
mpCondFormatList-UpdateInsertTab(rCxt);
-for (SCCOL i=0; i = MAXCOL; i++) aCol[i].UpdateInsertTab(rCxt);
+ScTableProtection* pProtection = GetProtection();
+if (pProtection)
+pProtection-updateReference( URM_INSDEL, pDocument,
+ScRange( 0, 0, rCxt.mnInsertPos, MAXCOL, MAXROW, MAXTAB),
+0, 0, rCxt.mnSheets);
+
+for (SCCOL i=0; i = MAXCOL; i++)
+aCol[i].UpdateInsertTab(rCxt);
if (IsStreamValid())
SetStreamValid(false);
@@ -1628,6 +1639,12 @@ void ScTable::UpdateDeleteTab(
sc::RefUpdateDeleteTabContext rCxt )
if (mpCondFormatList)
mpCondFormatList-UpdateDeleteTab(rCxt);
+ScTableProtection* pProtection = GetProtection();
+if (pProtection)
+pProtection-updateReference( URM_INSDEL, pDocument,
+ScRange( 0, 0, rCxt.mnDeletePos, MAXCOL, MAXROW, MAXTAB),
+0, 0, -rCxt.mnSheets);
+
for (SCCOL i = 0; i = MAXCOL; ++i)
aCol[i].UpdateDeleteTab(rCxt);
@@ -1648,6 +1665,12 @@ void ScTable::UpdateMoveTab(
if(mpCondFormatList)
mpCondFormatList-UpdateMoveTab(rCxt);
+ScTableProtection* pProtection = GetProtection();
+if (pProtection)
+pProtection-updateReference( URM_REORDER, pDocument,
+ScRange( 0, 0, rCxt.mnOldPos, MAXCOL, MAXROW, MAXTAB),
+0, 0, rCxt.mnNewPos - rCxt.mnOldPos);
+
for ( SCCOL i=0; i = MAXCOL; i++ )
{
aCol[i].UpdateMoveTab(rCxt, nTabNo);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/new-chart-type-skeleton' - chart2/source
chart2/source/model/template/ChartTypeTemplate.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 34bd5659c138517cac53a34bdf55d5f63d0b33ca
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Mar 21 10:27:46 2014 -0400
Let's be more defensive here by checking for null return objects.
Change-Id: I5164e7d82f882ea9fe296a5a2df616d396d6726f
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 83e747e..748d40d 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -337,7 +337,11 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
if( bResult )
{
Sequence Reference XChartType aFormerlyUsedChartTypes;
-const OUString aChartTypeToMatch(
getChartTypeForNewSeries(aFormerlyUsedChartTypes)-getChartType());
+ReferenceXChartType xOldCT =
getChartTypeForNewSeries(aFormerlyUsedChartTypes);
+if (!xOldCT.is())
+return false;
+
+const OUString aChartTypeToMatch = xOldCT-getChartType();
const sal_Int32 nDimensionToMatch = getDimension();
for( sal_Int32 nCooSysIdx=0; bResult (nCooSysIdx
aCooSysSeq.getLength()); ++nCooSysIdx )
{
@@ -348,6 +352,9 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
Sequence Reference XChartType aChartTypeSeq(
xCTCnt-getChartTypes());
for( sal_Int32 nCTIdx=0; bResult (nCTIdx
aChartTypeSeq.getLength()); ++nCTIdx )
{
+if (!aChartTypeSeq[nCTIdx].is())
+return false;
+
// match chart type
bResult = bResult
aChartTypeSeq[nCTIdx]-getChartType().equals( aChartTypeToMatch );
bool bFound=false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - vcl/inc vcl/source vcl/unx
vcl/inc/unx/salgdi.h |1 -
vcl/source/window/layout.cxx |1 +
vcl/unx/generic/gdi/salgdi.cxx |1 +
vcl/unx/generic/gdi/salgdi3.cxx|2 --
vcl/unx/generic/window/salframe.cxx|5 +++--
vcl/unx/generic/window/salobj.cxx | 13 +
vcl/unx/gtk/a11y/atktextattributes.cxx |7 ++-
7 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit 706893eb2d737e1475945f4204f95b7382992240
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 13:26:16 2014 +
coverity#736078 Missing break in switch
Change-Id: I9b47828d3aea4d84788958f56056c1b62a806b36
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 4da3a8f..4c8a776 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -602,6 +602,7 @@ void VclButtonBox::setAllocation(const Size rAllocation)
break;
default:
SAL_WARN(vcl.layout, todo unimplemented layout style);
+//fall-through
case VCL_BUTTONBOX_DEFAULT_STYLE:
case VCL_BUTTONBOX_END:
if (!aReq.m_aMainGroupDimensions.empty())
commit adcb33d71d2c2732fb5af7d19a4cd58adb009993
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 13:23:09 2014 +
coverity#708662 Uninitialized pointer field
Change-Id: Icfa4ee2a525016775b5917143b5c4333212db362
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 03e7f50..dc7a46a 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -110,7 +110,6 @@ protected:
SalColornTextColor_;
Pixel nTextPixel_;
-boolbFontVertical_;
boolbDisableGraphite_;
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index c4b9cf9..3394c0f 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -92,6 +92,7 @@ X11SalGraphics::X11SalGraphics()
{
m_pFrame= NULL;
m_pVDev = NULL;
+m_pColormap = NULL;
m_pDeleteColormap = NULL;
hDrawable_ = None;
m_aXRenderPicture= 0;
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 109c95a..05e9de37 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -135,8 +135,6 @@ bool X11SalGraphics::setFont( const FontSelectPattern
*pEntry, int nFallbackLeve
if( !pEntry )
return false;
-bFontVertical_ = pEntry-mbVertical;
-
// return early if this is not a valid font for this graphics
if( !pEntry-mpFontData )
return false;
commit 8c6f8b169c4f7b81defd8f85525abd07a5306339
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 13:19:32 2014 +
coverity#705331 Missing break in switch
Change-Id: Ie7416ac3b6cadce8e07d87b290869c0101c39783
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 7e8e69a..240a3c9 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3981,7 +3981,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
XSetInputFocus( GetXDisplay(), GetShellWindow(),
RevertToNone, CurrentTime );
}
-
+//fall-through
case ButtonRelease:
case MotionNotify:
case EnterNotify:
commit 1ff71f598c65a312d569b1b00cbf8d40b5dfd03e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 13:18:26 2014 +
coverity#705973 Dereference before null check
Change-Id: Iee76f24ad73d103507594fb1433fba7d1294d759
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index ad2dcd5..7e8e69a 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2595,7 +2595,8 @@ bool X11SalFrame::SetPluginParent( SystemParentData*
pNewParent )
{
if( pNewParent-nSize = sizeof(SystemParentData) )
m_bXEmbed = pNewParent-aWindow != None pNewParent-bXEmbedSupport;
-createNewWindow( pNewParent ? pNewParent-aWindow : None );
+
+createNewWindow(pNewParent-aWindow);
return true;
}
commit 2a36122dcb240d20bd20af24e9a334cde8e165ae
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 13:16:42 2014 +
coverity#708674 Uninitialized pointer field
Change-Id: Ie48cefda1ac7f626e8b5f969209c6960c124a889
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index af85a8c..4588321 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -229,12 +229,13 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long
nWidth, long nHeight )
}
}
-
-
// SalObject Implementation
-
-
X11SalObject::X11SalObject()
+: mpParent(NULL)
+, maPrimary(0)
+, maSecondary(0)
+, maColormap(0)
+, mbVisible(false)
{
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/ooxml/OOXMLDocument.hxx |3
writerfilter/source/filter/ImportFilter.cxx |3
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 62 --
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 13 +++
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2
5 files changed, 75 insertions(+), 8 deletions(-)
New commits:
commit fdacaab2485fa42648ae96348b9ad6a9e1f49424
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Mar 21 15:31:21 2014 +0100
DOCX import: implement progressbar
The design follows what we do in case of ODT import already: read the
number of paragraphs from the document statistics metadata, and then
estimate progress based on the number of already imported paragraphs.
Change-Id: I042cc6014c05ca7456fdf1c8d7247b615ba3a244
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 4bbc31b..7f104ab 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -24,6 +24,7 @@
#include com/sun/star/io/XInputStream.hpp
#include com/sun/star/uno/XComponentContext.hpp
#include resourcemodel/WW8ResourceModel.hxx
+#include com/sun/star/task/XStatusIndicator.hpp
#include com/sun/star/xml/sax/XParser.hpp
#include com/sun/star/xml/sax/XFastParser.hpp
#include com/sun/star/xml/sax/XFastTokenHandler.hpp
@@ -269,7 +270,7 @@ public:
createStream(OOXMLStream::Pointer_t pStream, const OUString rId);
static OOXMLDocument *
-createDocument(OOXMLStream::Pointer_t pStream);
+createDocument(OOXMLStream::Pointer_t pStream, const
uno::Referencetask::XStatusIndicator xStatusIndicator);
};
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index b6615a9..d75e56b 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -105,7 +105,8 @@ sal_Bool WriterFilter::filter( const uno::Sequence
beans::PropertyValue aDes
if( eType == writerfilter::dmapper::DOCUMENT_OOXML )
{
writerfilter::ooxml::OOXMLStream::Pointer_t pDocStream =
writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext,
xInputStream, bRepairStorage);
-writerfilter::ooxml::OOXMLDocument::Pointer_t
pDocument(writerfilter::ooxml::OOXMLDocumentFactory::createDocument(pDocStream));
+uno::Referencetask::XStatusIndicator xStatusIndicator =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_STATUSINDICATOR(),
uno::Referencetask::XStatusIndicator());
+writerfilter::ooxml::OOXMLDocument::Pointer_t
pDocument(writerfilter::ooxml::OOXMLDocumentFactory::createDocument(pDocStream,
xStatusIndicator));
uno::Referenceframe::XModel xModel(m_xDstDoc, uno::UNO_QUERY_THROW);
pDocument-setModel(xModel);
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 60ac009..83cdb58 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -17,8 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include comphelper/sequenceashashmap.hxx
+
#include com/sun/star/xml/sax/XParser.hpp
+#include com/sun/star/document/XDocumentPropertiesSupplier.hpp
#include com/sun/star/xml/sax/SAXException.hpp
#include com/sun/star/xml/dom/DocumentBuilder.hpp
#include com/sun/star/embed/XHierarchicalStorageAccess.hpp
@@ -30,6 +33,11 @@
#include OOXMLPropertySetImpl.hxx
#include ooxmlLoggers.hxx
+#include tools/resmgr.hxx
+#include vcl/svapp.hxx
+#include vcl/settings.hxx
+#include svx/dialogs.hrc
+
#include iostream
// this extern variable is declared in OOXMLStreamImpl.hxx
@@ -46,12 +54,17 @@ TagLogger::Pointer_t
debug_logger(TagLogger::getInstance(DEBUG));
using namespace ::std;
-OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream)
+OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream, const
uno::Referencetask::XStatusIndicator xStatusIndicator)
: mpStream(pStream)
+, mxStatusIndicator(xStatusIndicator)
, mnXNoteId(0)
, mXNoteType(0)
, mxThemeDom(0)
, mbIsSubstream(false)
+, mnPercentSize(0)
+, mnProgressLastPos(0)
+, mnProgressCurrentPos(0)
+, mnProgressEndPos(0)
{
}
@@ -257,7 +270,8 @@ OOXMLDocumentImpl::getSubStream(const OUString rId)
(OOXMLDocumentFactory::createStream(mpStream, rId));
OOXMLDocumentImpl * pTemp;
-writerfilter::ReferenceStream::Pointer_t pRet( pTemp = new
OOXMLDocumentImpl(pStream) );
+// Do not pass status indicator to sub-streams: they are typically
marginal in size, so we just track the main document for now.
+writerfilter::ReferenceStream::Pointer_t pRet( pTemp = new
OOXMLDocumentImpl(pStream, uno::Referencetask::XStatusIndicator()) );
pTemp-setModel(mxModel);
[Libreoffice-commits] core.git: oox/source
oox/source/core/xmlfilterbase.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 09e064adc51bf4a26a4f316d42945be9cfbd2c95
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Mar 21 14:24:36 2014 +0100
First check if this is the one we search for, then extract.
Change-Id: Ie98dc14b743983e68f126ed4b7a7f00b637957d3
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 5fc7c87..9c7ee32 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -666,13 +666,12 @@ writeAppProperties( XmlFilterBase rSelf, Reference
XDocumentProperties xProp
uno::Sequencebeans::NamedValue aStats =
xProperties-getDocumentStatistics();
for (sal_Int32 i = 0; i aStats.getLength(); ++i)
{
-sal_Int32 nValue = 0;
-if (aStats[i].Value = nValue)
+if (aStats[i].Name == ParagraphCount)
{
-OUString aValue = OUString::number(nValue);
-if (aStats[i].Name == ParagraphCount)
+sal_Int32 nValue = 0;
+if (aStats[i].Value = nValue)
{
-writeElement(pAppProps, XML_Paragraphs, aValue);
+writeElement(pAppProps, XML_Paragraphs,
OUString::number(nValue));
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/new-chart-type-skeleton' - chart2/Library_chartcore.mk chart2/source
chart2/Library_chartcore.mk |1
chart2/source/model/template/ChartTypeManager.cxx |7 ++
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx | 36 +++
chart2/source/model/template/GL3DBarChartTypeTemplate.hxx | 43 ++
chart2/source/tools/DiagramHelper.cxx |2
5 files changed, 88 insertions(+), 1 deletion(-)
New commits:
commit 7b458d2a6261af6b8eaf16a077b02d0168eea6c0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Mar 21 10:55:06 2014 -0400
Skeleton template class for GL3D bar chart type.
Still very much empty. It needs to be filled with sub-categories.
Change-Id: Iad7ad34efb264025541b585a92ee2ea7b8fff56f
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 2e09fe3..63171f4 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -154,6 +154,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/model/template/DataInterpreter \
chart2/source/model/template/FilledNetChartType \
chart2/source/model/template/GL3DBarChartType \
+chart2/source/model/template/GL3DBarChartTypeTemplate \
chart2/source/model/template/LineChartType \
chart2/source/model/template/LineChartTypeTemplate \
chart2/source/model/template/NetChartType \
diff --git a/chart2/source/model/template/ChartTypeManager.cxx
b/chart2/source/model/template/ChartTypeManager.cxx
index e68744c..49775f9 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -33,6 +33,7 @@
#include StockChartTypeTemplate.hxx
#include NetChartTypeTemplate.hxx
#include BubbleChartTypeTemplate.hxx
+#include GL3DBarChartTypeTemplate.hxx
#include cppuhelper/component_context.hxx
#include comphelper/InlineContainer.hxx
#include com/sun/star/container/XContentEnumerationAccess.hpp
@@ -121,6 +122,7 @@ enum TemplateId
TEMPLATE_STOCKVOLUMELOWHIGHCLOSE,
TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE,
TEMPLATE_BUBBLE,
+TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE,
//TEMPLATE_SURFACE,
// TEMPLATE_ADDIN,
TEMPLATE_NOT_FOUND = 0x
@@ -196,6 +198,7 @@ const tTemplateMapType lcl_DefaultChartTypeMap()
( com.sun.star.chart2.template.StockVolumeLowHighClose,
TEMPLATE_STOCKVOLUMELOWHIGHCLOSE )
( com.sun.star.chart2.template.StockVolumeOpenLowHighClose,
TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE )
( com.sun.star.chart2.template.Bubble,
TEMPLATE_BUBBLE )
+( com.sun.star.chart2.template.GL3DBarRoundedRectangle,
TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE )
// ( com.sun.star.chart2.template.Surface,
TEMPLATE_SURFACE )
// ( com.sun.star.chart2.template.Addin,
TEMPLATE_ADDIN )
);
@@ -529,6 +532,10 @@ uno::Reference uno::XInterface SAL_CALL
ChartTypeManager::createInstance(
xTemplate.set( new BubbleChartTypeTemplate( m_xContext,
aServiceSpecifier ));
break;
+case TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE:
+xTemplate.set(new GL3DBarChartTypeTemplate(m_xContext,
aServiceSpecifier));
+break;
+
//case TEMPLATE_SURFACE:
//case TEMPLATE_ADDIN:
// break;
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
new file mode 100644
index 000..306481e
--- /dev/null
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include GL3DBarChartTypeTemplate.hxx
+
+using namespace com::sun::star;
+
+namespace chart {
+
+GL3DBarChartTypeTemplate::GL3DBarChartTypeTemplate(
+const uno::Referenceuno::XComponentContext xContext, const OUString
rServiceName ) :
+ChartTypeTemplate(xContext, rServiceName) {}
+
+GL3DBarChartTypeTemplate::~GL3DBarChartTypeTemplate() {}
+
+uno::Referencechart2::XChartType
GL3DBarChartTypeTemplate::getChartTypeForIndex( sal_Int32 /*nChartTypeIndex*/ )
+{
+return uno::Referencechart2::XChartType();
+}
+
+uno::Referencechart2::XChartType
+GL3DBarChartTypeTemplate::getChartTypeForNewSeries(
+const uno::Sequenceuno::Referencechart2::XChartType
/*xOldChartTypes*/ )
+{
+return uno::Referencechart2::XChartType();
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
new file mode 100644
index 000..2574329
[Libreoffice-commits] help.git: 10 commits - source/text
source/text/schart/01/0402.xhp |8 source/text/schart/01/05040202.xhp |8 source/text/shared/01/01100300.xhp | 10 +- source/text/shared/01/01100600.xhp | 12 ++-- source/text/shared/01/05210300.xhp |2 +- source/text/shared/01/0532.xhp |2 +- source/text/shared/01/0613.xhp |6 +++--- source/text/smath/01/0501.xhp |2 +- source/text/swriter/01/0517.xhp |4 ++-- 9 files changed, 27 insertions(+), 27 deletions(-) New commits: commit f8aa9509d36c652b00e4c7c827dcdab62a218c56 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 14:59:14 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: If88a660220cdcc97405a34add6a04468e471d95e diff --git a/source/text/shared/01/01100600.xhp b/source/text/shared/01/01100600.xhp index 03b5861..184a7c3 100644 --- a/source/text/shared/01/01100600.xhp +++ b/source/text/shared/01/01100600.xhp @@ -36,7 +36,7 @@ bookmark_valuesaving;with password by default/bookmark_value bookmark_valueuser data;removing when saving/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/cui/ui/securityinfopage/SecurityInfoPage id=bm_id82958468 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/securityinfopage/SecurityInfoPage id=bm_id82958468 localize=false/ paragraph role=heading id=hd_id3149969 xml-lang=en-US level=1 l10n=NEWlink href=text/shared/01/01100600.xhp name=SecuritySecurity/link/paragraph paragraph role=paragraph id=par_id3156049 xml-lang=en-US l10n=NEWahelp hid=.Sets password options for the current document./ahelp/paragraph @@ -45,19 +45,19 @@ embed href=text/shared/00/0401.xhp#infosec/ /section -bookmark xml-lang=en-US branch=hid/cui/ui/securityinfopage/readonly id=bm_id8295846 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/securityinfopage/readonly id=bm_id8295846 localize=false/ paragraph role=heading id=par_idN106AA xml-lang=en-US level=3 l10n=NEWOpen file read-only/paragraph paragraph role=paragraph id=par_idN106AE xml-lang=en-US l10n=NEWahelp hid=.Select to allow this document to be opened in read-only mode only./ahelp/paragraph paragraph role=note id=par_idN106B1 xml-lang=en-US l10n=NEWThis file sharing option protects the document against accidental changes. It is still possible to edit a copy of the document and save that copy with the same name as the original./paragraph -bookmark xml-lang=en-US branch=hid/cui/ui/securityinfopage/recordchanges id=bm_id868861 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/securityinfopage/recordchanges id=bm_id868861 localize=false/ paragraph role=heading id=par_idN106B4 xml-lang=en-US level=3 l10n=NEWRecord changes/paragraph paragraph role=paragraph id=par_idN106B8 xml-lang=en-US l10n=NEWahelp hid=.Select to enable recording changes. This is the same as emphEdit - Changes - Record/emph./ahelp/paragraph paragraph role=tip id=par_idN106C9 xml-lang=en-US l10n=NEWTo protect the recording state with a password, click emphProtect/emph and enter a password. Other users of this document can apply their changes, but they cannot disable change recording without knowing the password./paragraph -bookmark xml-lang=en-US branch=hid/cui/ui/securityinfopage/unprotect id=bm_id2517167 localize=false/ -bookmark xml-lang=en-US branch=hid/cui/ui/securityinfopage/protect id=bm_id2517166 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/securityinfopage/unprotect id=bm_id2517167 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/securityinfopage/protect id=bm_id2517166 localize=false/ paragraph role=heading id=par_idN106D0 xml-lang=en-US level=3 l10n=NEWProtect / Unprotect/paragraph -paragraph role=paragraph id=par_idN106D4 xml-lang=en-US l10n=NEWahelp hid=cui/ui/securityinfopage/protectProtects the change recording state with a password. If change recording is protected for the current document, the button is named emphUnprotect/emph. Click emphUnprotect/emph and type the correct password to disable the protection./ahelp/paragraph +paragraph role=paragraph id=par_idN106D4 xml-lang=en-US l10n=NEWahelp hid=sfx/ui/securityinfopage/protectProtects the change recording state with a password. If change recording is protected for the current document, the button is named emphUnprotect/emph. Click emphUnprotect/emph and type the correct password to disable the protection./ahelp/paragraph /body commit 47427ec010d831843a7cd43e1cb051deb3c5a737 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 14:58:31 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: I246ee53ea50357217961d1e68a96782bf4feb373 diff --git a/source/text/schart/01/0402.xhp b/source/text/schart/01/0402.xhp index 355f3a1..f1fd1b3 100644 --- a/source/text/schart/01/0402.xhp +++ b/source/text/schart/01/0402.xhp @@ -63,19 +63,19 @@ bookmark xml-lang=en-US
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b7adff61fb54aa383cec93f94debbfb77b52327 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 14:59:14 2014 + Updated core Project: help f8aa9509d36c652b00e4c7c827dcdab62a218c56 diff --git a/helpcontent2 b/helpcontent2 index 7182afe..f8aa950 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7182afe0322254178ed9b6096a62c9cc8c6f3b62 +Subproject commit f8aa9509d36c652b00e4c7c827dcdab62a218c56 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #14 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=3297aa5b1adf85c647149bc2c7554926f6a17c76 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #15 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=c60b235a1106223970597d6fe454611edd8a Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #16 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=7f0f15ddaddf3ca1650d352df3c5f2ebc8f388e3 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #19 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=0b983cb5f69ff05297ce2316f4511bb3911d0c3c Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #18 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=8f906dd6652e5e0c2acba18b73def46107c11369 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #17 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=9c01be3fee47ca39553f0e9aed8b3924a325f2fc Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #20 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=ef67721bb2357a185c576b82e663f59b9c293591 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #21 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=6d4b1cf4fb400c52a1407adc1aa1ae335719f4af Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #22 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=47427ec010d831843a7cd43e1cb051deb3c5a737 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #23 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=f8aa9509d36c652b00e4c7c827dcdab62a218c56 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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] dev-tools.git: scripts/test-hid-vs-ui.py
scripts/test-hid-vs-ui.py | 32
1 file changed, 28 insertions(+), 4 deletions(-)
New commits:
commit 93e9c813607749fb6eb542aeea477a475e5b2ff1
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:14:24 2014 +
map the modules and special names back manually
diff --git a/scripts/test-hid-vs-ui.py b/scripts/test-hid-vs-ui.py
index 27fc068..f6ba14f 100755
--- a/scripts/test-hid-vs-ui.py
+++ b/scripts/test-hid-vs-ui.py
@@ -51,7 +51,7 @@ def init_core_files():
elif not args['git_static']:
subprocess.call(['git','fetch','origin'])
allfiles =
subprocess.check_output(['git','ls-tree','--name-only','--full-name','-r','master'])
-return '\n'.join(re.findall('.*\.ui',allfiles))
+return re.findall('.*\.ui',allfiles)
if __name__ == __main__:
@@ -74,7 +74,31 @@ if __name__ == __main__:
hid = rawtext.split('hid=')[1].split('')[0]
if hid.startswith('.uno'): continue
uifileraw, compname = hid.rsplit('/',1)
-uifile = uifileraw.split('/',1)[1] + .ui # remove modules/ which
exist only in install
+uifile = uifileraw + .ui
+# map modules/ etc, which exist only in install
+# back to their source location
+if uifile.startswith(modules/scalc):
+uifile = sc/scalc + uifile[13:]
+elif uifile.startswith(modules/swriter):
+uifile = sw/swriter + uifile[15:]
+elif uifile.startswith(modules/schart):
+uifile = chart2 + uifile[14:]
+elif uifile.startswith(modules/smath):
+uifile = starmath/smath + uifile[13:]
+elif uifile.startswith(modules/sdraw):
+uifile = sd/sdraw + uifile[13:]
+elif uifile.startswith(modules/simpress):
+uifile = sd/simpress + uifile[16:]
+elif uifile.startswith(modules/BasicIDE):
+uifile = basctl/basicide + uifile[16:]
+elif uifile.startswith(modules/spropctrlr):
+uifile = extensions/spropctrlr + uifile[18:]
+elif uifile.startswith(sfx):
+uifile = sfx2 + uifile[3:]
+elif uifile.startswith(svt):
+uifile = svtools + uifile[3:]
+components = uifile.split('/',1);
+uifile = components[0] + '/uiconfig/' + components[1]
targets[uifile].add(compname.split(':')[0])
origin[uifile].add(fname) # help file(s)
@@ -90,10 +114,10 @@ if __name__ == __main__:
errors += '\nFrom ' + origin[uikey].pop()
else:
errors += '\nFrom one of ' +
str(origin[uikey]).replace('set(','').replace(')','')
-errors += ', we did not found file '+ uikey+'.'
+errors += ', we did not find file '+ uikey+'.'
continue
-full_path =
os.path.join(core_repo_dir,re.search('(.*'+uikey+')',uifileslist).group(1))
+full_path = os.path.join(core_repo_dir,uikey)
# print full_path
root = ET.parse(full_path).getroot()
ids = [element.attrib['id'].split(':')[0] for element in
root.findall('.//object[@id]') ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 76ff20b5766758c4f4343064d744b2b330ab3885 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 15:11:56 2014 + Updated core Project: help 6a97b776ce1d7a6fc454203ece60ab506228d4e1 diff --git a/helpcontent2 b/helpcontent2 index f8aa950..6a97b77 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f8aa9509d36c652b00e4c7c827dcdab62a218c56 +Subproject commit 6a97b776ce1d7a6fc454203ece60ab506228d4e1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/0517.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a97b776ce1d7a6fc454203ece60ab506228d4e1 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 15:11:56 2014 + Related: fdo#67350 test-hid-vs-ui detected typo Change-Id: I1fd5e217fbd75427d381d8051b707b2fce262f3a diff --git a/source/text/swriter/01/0517.xhp b/source/text/swriter/01/0517.xhp index b4a3ef3..d8a5bc8 100644 --- a/source/text/swriter/01/0517.xhp +++ b/source/text/swriter/01/0517.xhp @@ -44,7 +44,7 @@ paragraph role=paragraph id=par_id3154561 xml-lang=en-US l10n=U oldref=7ahelp hid=sfx/ui/loadtemplatedialog/categoriesLists the available template categories. Click a category to view its contents in the emphTemplates /emphlist./ahelp/paragraph bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/templates id=bm_id3145242 localize=false/ paragraph role=heading id=hd_id3149885 xml-lang=en-US level=2 l10n=U oldref=8Templates/paragraph -paragraph role=paragraph id=par_id3145249 xml-lang=en-US l10n=U oldref=9ahelp hid=sfx/ui/loadtemplatedialog/loadtemplatedialog/templatesLists the available templates for the selected category./ahelp/paragraph +paragraph role=paragraph id=par_id3145249 xml-lang=en-US l10n=U oldref=9ahelp hid=sfx/ui/loadtemplatedialog/templatesLists the available templates for the selected category./ahelp/paragraph bookmark xml-lang=en-US branch=hid/sfx/ui/loadtemplatedialog/text id=bm_id3148772 localize=false/ paragraph role=heading id=hd_id3148392 xml-lang=en-US level=2 l10n=U oldref=10Text/paragraph paragraph role=paragraph id=par_id3149026 xml-lang=en-US l10n=U oldref=11ahelp hid=sfx/ui/loadtemplatedialog/textLoads the paragraph and the character styles from the selected document into the current document./ahelp/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #24 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/help/commit/?id=6a97b776ce1d7a6fc454203ece60ab506228d4e1 Related: fdo#67350 test-hid-vs-ui detected typo The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: svtools/source svtools/uiconfig
svtools/source/dialogs/addresstemplate.cxx |1 - svtools/uiconfig/ui/addresstemplatedialog.ui |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit f5179bcbac9a0b33546e442a9e176b1791dff170 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 15:13:42 2014 + just give the enclosing frame the required helpid Change-Id: Ifb0209eaea4f738ac5b5826f924552465272 diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index ae09869..ce6fcc0 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -587,7 +587,6 @@ void AssignmentPersistentData::Commit() m_pImpl-pFields[row * 2 + column] = getListBox(OString(box) + OString::number(row * 2 + column)); m_pImpl-pFields[row * 2 + column]-SetSelectHdl(LINK(this, AddressBookSourceDialog, OnFieldSelect)); -m_pImpl-pFields[row * 2 + column]-SetHelpId(svt/ui/addresstemplatedialog/assign); } } diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui index 01b4e76..65e708c 100644 --- a/svtools/uiconfig/ui/addresstemplatedialog.ui +++ b/svtools/uiconfig/ui/addresstemplatedialog.ui @@ -210,7 +210,7 @@ /packing /child child - object class=GtkFrame id=frame2 + object class=GtkFrame id=assign property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67350] sanity check utility for help ids
https://bugs.freedesktop.org/show_bug.cgi?id=67350 --- Comment #25 from Caolán McNamara caol...@redhat.com --- ok, so that's pretty cool and loads of bugs found and fixed :-) Which is a really excellent outcome. A question though, why checkout the git repositories as part of the script rather than operate on a pre-existing one ? I mean what about moving from devtools into core/bin and make it operate on the current repository ? That could enable allowing us to run it during e.g. make check when help is checked out so we would be continuously checking for failures. -- 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: officecfg/registry sc/source
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |4 +--
sc/source/ui/view/tabvwsh3.cxx|4 ++-
sc/source/ui/view/tabvwsha.cxx| 13
+-
3 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit f2d009a675755136e2e06b2866bc055b06cea6c8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Mar 21 11:28:59 2014 -0400
Make it harder to accidentally set print range to '- none -'.
And make the current print range behavior a bit more intuitive. People
often remove ranges to quickly clear any custom ranges if set. They
wouldn't expect this to actually set the print range to none.
Also, change the wording of the menu item from Remove to Clear, to
refect this behavior change.
Change-Id: I0369020fedf1c7463d718809875022adef697bf4
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index cdfd826..249b0ba 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -550,10 +550,10 @@
/node
node oor:name=.uno:DeletePrintArea oor:op=replace
prop oor:name=Label oor:type=xs:string
- value xml:lang=en-US~Remove Print Area/value
+ value xml:lang=en-US~Clear Print Area/value
/prop
prop oor:name=ContextLabel oor:type=xs:string
- value xml:lang=en-US~Remove/value
+ value xml:lang=en-US~Clear/value
/prop
prop oor:name=Properties oor:type=xs:int
value1/value
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index c74de5a..d8d4827 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -190,8 +190,10 @@ void ScTabViewShell::Execute( SfxRequest rReq )
case SID_DELETE_PRINTAREA:
{
+// Clear currently defined print range if any, and reset it to
+// print entire sheet which is the default.
OUString aEmpty;
-SetPrintRanges( false, aEmpty, NULL, NULL, false );//
Druckbereich loeschen
+SetPrintRanges(true, aEmpty, NULL, NULL, false);
rReq.Done();
}
break;
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index af5cd66..5e8ae2a 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -191,21 +191,12 @@ void ScTabViewShell::GetState( SfxItemSet rSet )
break;
case SID_DELETE_PRINTAREA:
-if ( nTabSelCount 1 )
-{
-// #i22589# also take Print Entire Sheet into account
here
-bool bHas = false;
-for (SCTAB i=0; !bHas inTabCount; i++)
-bHas = rMark.GetTableSelect(i)
(pDoc-GetPrintRangeCount(i) || pDoc-IsPrintEntireSheet(i));
-if (!bHas)
-rSet.DisableItem( nWhich );
-}
-else if ( !pDoc-GetPrintRangeCount( nTab )
!pDoc-IsPrintEntireSheet( nTab ) )
-rSet.DisableItem( nWhich );
if ( pDocShell pDocShell-IsDocShared() )
{
rSet.DisableItem( nWhich );
}
+else if (pDoc-IsPrintEntireSheet(nTab))
+rSet.DisableItem(nWhich);
break;
case SID_STATUS_PAGESTYLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e19de1925d41fb4af490df1c5b64ce737f5f9cf9 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 15:50:58 2014 + Updated core Project: help b0fd711c33b96466e3be944fdc497f9c248e8b38 diff --git a/helpcontent2 b/helpcontent2 index 6a97b77..b0fd711 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6a97b776ce1d7a6fc454203ece60ab506228d4e1 +Subproject commit b0fd711c33b96466e3be944fdc497f9c248e8b38 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 9 commits - cui/source sw/source vcl/source writerfilter/source
cui/source/options/treeopt.cxx|3 ++
sw/source/core/uibase/shells/annotsh.cxx | 23 +++---
sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 10 +--
sw/source/ui/index/cnttab.cxx | 11 +++-
vcl/source/fontsubset/sft.cxx |2 -
vcl/source/gdi/outdev3.cxx|5 +--
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 21
7 files changed, 32 insertions(+), 43 deletions(-)
New commits:
commit 87d1e5c27d33f79f45fff3a1c9d05f0d3662cfaa
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:48:11 2014 +
coverity#705459 Dereference null return value
Change-Id: Ib49e23529e34dfc4afda45f26eec15af67e9da68
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 057f014..1a23f7d 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -877,6 +877,9 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
pEntry = aTreeLB.Next(pEntry);
}
+if ( !pEntry )
+return;
+
SvTreeListEntry* pParent = aTreeLB.GetParent(pEntry);
aTreeLB.Expand(pParent);
aTreeLB.MakeVisible(pParent);
commit 292ba61eae3318edd86ec0af4d8726189bc2affd
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:46:37 2014 +
coverity#1000766 Dereference before null check
Change-Id: I539cb91511fe95d004044a98736b4a6b99f24a5b
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 7de3d81..093da2f 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -4212,9 +4212,8 @@ SalLayout* OutputDevice::ImplLayout(const OUString
rOrigStr,
// do glyph fallback if needed
// #105768# avoid fallback for very small font sizes
-if( aLayoutArgs.NeedFallback() )
-if( mpFontEntry (mpFontEntry-maFontSelData.mnHeight = 3) )
-pSalLayout = ImplGlyphFallbackLayout( pSalLayout, aLayoutArgs );
+if (aLayoutArgs.NeedFallback() mpFontEntry-maFontSelData.mnHeight = 3)
+pSalLayout = ImplGlyphFallbackLayout(pSalLayout, aLayoutArgs);
// position, justify, etc. the layout
pSalLayout-AdjustLayout( aLayoutArgs );
commit 85771a44ccc6404bbafbd5f70eff3c39ae85e507
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:41:49 2014 +
coverity#705975 Dereference before null check
Change-Id: I5499cba6f72c9bcf4b47363da7003fa9bc94dfa6
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 4615286..14e0c3c 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2232,12 +2232,9 @@
OOXMLFastContextHandlerWrapper::OOXMLFastContextHandlerWrapper
uno::ReferenceXFastContextHandler xContext)
: OOXMLFastContextHandler(pParent), mxContext(xContext)
{
-if (pParent != NULL)
-{
-setId(pParent-getId());
-setToken(pParent-getToken());
-setPropertySet(pParent-getPropertySet());
-}
+setId(pParent-getId());
+setToken(pParent-getToken());
+setPropertySet(pParent-getPropertySet());
}
OOXMLFastContextHandlerWrapper::~OOXMLFastContextHandlerWrapper()
commit ba811903a6eb12ec599ca8e84c97d2e6cfc48cb4
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:40:42 2014 +
coverity#705974 Dereference before null check
Change-Id: I6286888f85214a82ad232dd26b7b23e175de39d4
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 667646b..4615286 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -147,8 +147,8 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
mId(0),
mnDefine(0),
mnToken(OOXML_FAST_TOKENS_END),
- mpStream(NULL),
- mnTableDepth(0),
+ mpStream(pContext-mpStream),
+ mnTableDepth(pContext-mnTableDepth),
mnInstanceNumber(mnInstanceCount),
mnRefCount(0),
inPositionV(pContext-inPositionV),
@@ -157,13 +157,7 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
m_bTookChoice(pContext-m_bTookChoice),
m_aSavedAlternateStates(pContext-m_aSavedAlternateStates)
{
-if (pContext != NULL)
-{
-mpStream = pContext-mpStream;
-mpParserState = pContext-mpParserState;
-mnTableDepth = pContext-mnTableDepth;
-m_xContext = pContext-m_xContext;
-}
+mpParserState = pContext-mpParserState;
if (mpParserState.get() == NULL)
mpParserState.reset(new OOXMLParserState());
commit 94319e31f08310266280307be08f78311385ca6d
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:38:08 2014 +
coverity#705953 Dereference before null check
Change-Id: Ia9d6af4d601b76dfb9e950fdb4bdaf283f3e985c
diff --git
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/spadmin.xhp | 129 ---
1 file changed, 3 insertions(+), 126 deletions(-)
New commits:
commit b0fd711c33b96466e3be944fdc497f9c248e8b38
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:50:58 2014 +
clean up mentions of spadmin etc around printing and faxing
Change-Id: I51e696ef74bb95b5cc081286c51400162a674a60
diff --git a/source/text/shared/guide/spadmin.xhp
b/source/text/shared/guide/spadmin.xhp
index 215ef01..81a813e 100644
--- a/source/text/shared/guide/spadmin.xhp
+++ b/source/text/shared/guide/spadmin.xhp
@@ -22,7 +22,7 @@
helpdocument version=1.0
meta
topic id=textsharedguidespadminxml indexer=include status=PUBLISH
-title id=tit xml-lang=en-USSetting up Printer and Fax Under UNIX Based
Platforms/title
+title id=tit xml-lang=en-USConfiguring Printer and Fax Under UNIX Based
Platforms/title
filename/text/shared/guide/spadmin.xhp/filename
/topic
/meta
@@ -34,124 +34,22 @@
bookmark_valuestandard printer under UNIX/bookmark_value
bookmark_valuefaxes; fax programs/fax printers under UNIX/bookmark_value
bookmark_valueprinters; faxes under UNIX/bookmark_value
-bookmark_valuePostScript; PDF converter, UNIX/bookmark_value
-bookmark_valueconverters; PostScript, UNIX/bookmark_value
-bookmark_valuePDF; PostScript to PDF converter, UNIX/bookmark_value
-/bookmarkcommentmw deleted printer programs under UNIX, fax programs
under UNIX and font programs under UNIX and changed faxes;.../comment
+/bookmark
paragraph role=paragraph id=par_id3154422 xml-lang=en-US l10n=E
oldref=341 localize=false/
paragraph role=heading id=hd_id3147834 xml-lang=en-US level=1
l10n=CHG oldref=1variable id=spadminlink
href=text/shared/guide/spadmin.xhp name=Setting up Printer and Fax Under
UNIX Based PlatformsSetting up Printer and Fax Under UNIX Based
Platforms/link
/variable/paragraph
section id=chapter_body
paragraph role=paragraph id=par_id3159876 xml-lang=en-US
l10n=NEW%PRODUCTNAME uses the installed fonts of your system. In a text
document you can select from all printable fonts. In an HTML document or in Web
layout, only fonts that are visible on screen are offered. In spreadsheets and
drawings you can select from all installed fonts./paragraph
-paragraph role=paragraph id=par_id3159233 xml-lang=en-US l10n=U
oldref=2Under UNIX based platforms, the printer administration program
emphspadmin/emph is provided to help you set up printers and faxes for use
with the $[officename] software./paragraph
-paragraph role=paragraph id=par_id3156410 xml-lang=en-US l10n=U
oldref=117Call the printer administration program emphspadmin/emph as
follows:/paragraph
-list type=unordered
-listitem
-paragraph role=listitem id=par_id3147242 xml-lang=en-US l10n=U
oldref=11Change to the {install_path}/program directory./paragraph
-/listitem
-listitem
-paragraph role=listitem id=par_id3147209 xml-lang=en-US l10n=U
oldref=12Enter: ./spadmin/paragraph
-/listitem
-/list
-paragraph role=paragraph id=par_id3152349 xml-lang=en-US l10n=U
oldref=14After it starts, the window of the printer administration program
emphspadmin/emph appears./paragraph
-paragraph role=paragraph id=par_id3149580 xml-lang=en-US l10n=U
oldref=10Following a server installation, the system administrator first
logs on as with root privileges, and starts the printer administration program
emphspadmin/emph. The administrator then creates a general printer
configuration file called {install_path}/share/psprint/psprint.conf for all
users. All changes are immediately available to all users./paragraph
-
-paragraph role=heading id=hd_id3159177 xml-lang=en-US level=2
l10n=U oldref=121Setting up Printers/paragraph
-paragraph role=paragraph id=par_id3159157 xml-lang=en-US l10n=U
oldref=122Under UNIX based platforms, the $[officename] software only offers
direct support for printers using the PostScript technology. Other printers
must be set up as described in the section emphPrinter Drivers in the
$[officename] Software/emph. The $[officename] software automatically
provides a printer with the default driver for each system queue. You can add
additional printers as needed./paragraph
-paragraph role=heading id=hd_id3148564 xml-lang=en-US level=3
l10n=U oldref=286Adding a Printer/paragraph
-list type=ordered
-listitem
-paragraph role=listitem id=par_id3147559 xml-lang=en-US l10n=U
oldref=353Change to the {install_path}/program directory./paragraph
-/listitem
-listitem
-paragraph role=listitem id=par_id3152360 xml-lang=en-US l10n=U
oldref=354Enter: ./spadmin/paragraph
-/listitem
-listitem
-paragraph role=listitem id=par_id3153360 xml-lang=en-US l10n=U
oldref=287Click the emphNew Printer/emph button./paragraph
-/listitem
-listitem
-paragraph role=listitem id=par_id3151210 xml-lang=en-US l10n=U
oldref=288Select the emphCreate Printer/emph option and click
emphNext/emph./paragraph
-/listitem
-listitem
-paragraph role=listitem id=par_id3153192 xml-lang=en-US l10n=U
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabvwsha.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 172156ec8d2bfbfd4697d9e1676fe766b3c93069 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 15:55:56 2014 + WaE: -Werror=unused-variable Change-Id: I857fcd923788f086294f8f3e3105b44949d80e56 diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 5e8ae2a..c2de240 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -160,7 +160,6 @@ void ScTabViewShell::GetState( SfxItemSet rSet ) SfxViewFrame* pThisFrame = GetViewFrame(); bool bOle = GetViewFrame()-GetFrame().IsInPlace(); -SCTAB nTabCount = pDoc-GetTableCount(); SCTAB nTabSelCount = rMark.GetSelectCount(); SfxWhichIteraIter(rSet); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - officecfg/registry sc/source
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |4 +-
sc/source/ui/view/tabvwsh3.cxx|4 ++
sc/source/ui/view/tabvwsha.cxx| 14
+-
3 files changed, 7 insertions(+), 15 deletions(-)
New commits:
commit d27a2cd5f74e121aa91e22188b5a68a8075efc01
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Mar 21 11:28:59 2014 -0400
Make it harder to accidentally set print range to '- none -'.
And make the current print range behavior a bit more intuitive. People
often remove ranges to quickly clear any custom ranges if set. They
wouldn't expect this to actually set the print range to none.
Also, change the wording of the menu item from Remove to Clear, to
refect this behavior change.
(cherry picked from commit f2d009a675755136e2e06b2866bc055b06cea6c8)
Conflicts:
sc/source/ui/view/tabvwsh3.cxx
sc/source/ui/view/tabvwsha.cxx
Change-Id: I0369020fedf1c7463d718809875022adef697bf4
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index bb7cdac..33709a8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -526,10 +526,10 @@
/node
node oor:name=.uno:DeletePrintArea oor:op=replace
prop oor:name=Label oor:type=xs:string
- value xml:lang=en-US~Remove Print Area/value
+ value xml:lang=en-US~Clear Print Area/value
/prop
prop oor:name=ContextLabel oor:type=xs:string
- value xml:lang=en-US~Remove/value
+ value xml:lang=en-US~Clear/value
/prop
prop oor:name=Properties oor:type=xs:int
value1/value
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index e1041b1..6bda5b6 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -192,8 +192,10 @@ void ScTabViewShell::Execute( SfxRequest rReq )
case SID_DELETE_PRINTAREA:
{
+// Clear currently defined print range if any, and reset it to
+// print entire sheet which is the default.
String aEmpty;
-SetPrintRanges( false, aEmpty, NULL, NULL, false );//
Druckbereich loeschen
+SetPrintRanges(true, aEmpty, NULL, NULL, false);//
Druckbereich loeschen
rReq.Done();
}
break;
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 4e2d645..881a8d6 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -152,7 +152,6 @@ void ScTabViewShell::GetState( SfxItemSet rSet )
SfxViewFrame* pThisFrame = GetViewFrame();
sal_Bool bOle = GetViewFrame()-GetFrame().IsInPlace();
-SCTAB nTabCount = pDoc-GetTableCount();
SCTAB nTabSelCount = rMark.GetSelectCount();
SfxWhichIteraIter(rSet);
@@ -183,21 +182,12 @@ void ScTabViewShell::GetState( SfxItemSet rSet )
break;
case SID_DELETE_PRINTAREA:
-if ( nTabSelCount 1 )
-{
-// #i22589# also take Print Entire Sheet into account
here
-sal_Bool bHas = false;
-for (SCTAB i=0; !bHas inTabCount; i++)
-bHas = rMark.GetTableSelect(i)
(pDoc-GetPrintRangeCount(i) || pDoc-IsPrintEntireSheet(i));
-if (!bHas)
-rSet.DisableItem( nWhich );
-}
-else if ( !pDoc-GetPrintRangeCount( nTab )
!pDoc-IsPrintEntireSheet( nTab ) )
-rSet.DisableItem( nWhich );
if ( pDocShell pDocShell-IsDocShared() )
{
rSet.DisableItem( nWhich );
}
+else if (pDoc-IsPrintEntireSheet(nTab))
+rSet.DisableItem(nWhich);
break;
case SID_STATUS_PAGESTYLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/unocore/unofield.cxx | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit fc0c91c2d00157cb02cbe7b1d09cb950762e8145
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Fri Mar 21 12:32:09 2014 +
124474: on change of User Field via UNO-API trigger update to get dependent
Input Fields updated.
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 423dd7c..ea9ef00 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -540,18 +540,29 @@ void SwXFieldMaster::setPropertyValue( const OUString
rPropertyName,
}
}
}
-if( bSetValue )
+if ( bSetValue )
{
// nothing special to be done here for the properties
// UNO_NAME_DATA_BASE_NAME and UNO_NAME_DATA_BASE_URL.
// We just call PutValue (empty string is allowed).
// Thus the last property set will be used as Data Source.
-sal_uInt16 nMId = GetFieldTypeMId( rPropertyName, *pType );
-if( USHRT_MAX != nMId )
-pType-PutValue( rValue, nMId );
+const sal_uInt16 nMemberValueId = GetFieldTypeMId( rPropertyName,
*pType );
+if ( USHRT_MAX != nMemberValueId )
+{
+pType-PutValue( rValue, nMemberValueId );
+if ( pType-Which() == RES_USERFLD )
+{
+// trigger update of User field in order to get depending
Input Fields updated.
+pType-UpdateFlds();
+}
+}
else
-throw beans::UnknownPropertyException(OUString (
RTL_CONSTASCII_USTRINGPARAM ( Unknown property: ) ) + rPropertyName,
static_cast cppu::OWeakObject * ( this ) );
+{
+throw beans::UnknownPropertyException(
+OUString( RTL_CONSTASCII_USTRINGPARAM( Unknown property:
) ) + rPropertyName,
+static_cast cppu::OWeakObject * ( this ) );
+}
}
}
else if(!pType m_pDoc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/extensions/pre_MergedLibsList.mk |1 - 1 file changed, 1 deletion(-) New commits: commit d27b20b9c392ecbdf57c65d12c9cca85e4e05d57 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 16:15:19 2014 + another hidden libspa usage Change-Id: I523a9813c2b121342fc1bc31328ff8ce48f68c4d diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 9cc2079..0388d96 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -82,7 +82,6 @@ gb_EXTRAMERGEDLIBS := \ $(if $(filter-out ANDROID IOS,$(OS)),scn) \ sd \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \ - $(if $(filter unx,$(GUIBASE)),spa) \ spell \ svgfilter \ swd \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - Repository.mk sw/source
Repository.mk |3 ---
sw/source/filter/ww1/w1filter.cxx |2 ++
sw/source/filter/ww8/ww8par2.cxx |1 +
sw/source/filter/xml/xmltbli.cxx |1 +
4 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit cbce7443b2fa0c1304ff94a54eb48da0c4518146
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 16:20:27 2014 +
missing another libspa
Change-Id: I1e9a9e97ea2f6bdd43e6143830a3ab45177f9b05
diff --git a/Repository.mk b/Repository.mk
index 4e1e379..9fd036e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -323,9 +323,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
simplecanvas \
slideshow \
sot \
- $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
- $(if $(ENABLE_HEADLESS),,spa) \
- ) \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
$(if $(DISABLE_SCRIPTING),,stringresource) \
commit 9cb77ae1d0ef6c820800adaa234a0fbb50465db6
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 16:09:38 2014 +
coverity#982649 Missing break in switch
Change-Id: I258576aca6891060283c55eff7125a9d4681
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c248b54..9209ea3 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3011,6 +3011,7 @@ SvxFrameDirection MakeDirection(sal_uInt16 nCode, bool
bIsBiDi)
{
default:
OSL_ENSURE(eDir == 4, unknown direction code, maybe it's a
bitfield);
+//fall-through
case 3:
eDir = bIsBiDi ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; //
#i38158# - Consider RTL tables
break;
commit 0c5d6e657244d54a1eb15d06159cd217516d666c
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 16:01:51 2014 +
coverity#705313 Missing break in switch
Change-Id: I71c7c1af3f4ec804b1722003099869994199939d
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index ced4c19..826c1f6 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1494,6 +1494,7 @@ SvXMLImportContext
*SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
break;
case XML_TOK_TABLE_HEADER_ROWS:
bHeader = sal_True;
+//fall-through
case XML_TOK_TABLE_ROWS:
pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix,
rLocalName, xAttrList,
commit db4dc451efe6afe7a20a000b9ef4bbb2e94ac724
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:58:47 2014 +
coverity#705310 Missing break in switch
Change-Id: Ibadcc7c4da119989b57fcf96c5a2413f1346fca5
diff --git a/sw/source/filter/ww1/w1filter.cxx
b/sw/source/filter/ww1/w1filter.cxx
index ea38549..cbf59bf 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1125,6 +1125,7 @@ void W1_CHP::Out(Ww1Shell rOut, Ww1Manager rMan)
if (fsIcoGet())
switch(icoGet()) {
default: OSL_ENSURE(false, Chpx);
+//fall-through
case 0: { rOut.EndItem(RES_CHRATR_COLOR); } break;
case 1: { rOut SvxColorItem(Color(COL_BLACK), RES_CHRATR_COLOR); }
break;
case 2: { rOut SvxColorItem(Color(COL_LIGHTBLUE),
RES_CHRATR_COLOR); } break;
commit 37148c375504066839417eb4e6d0bd1dc161ed97
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 15:58:02 2014 +
coverity#705309 Missing break in switch
Change-Id: Ia1522c645793af8bc316885def415beb2a5d50d5
diff --git a/sw/source/filter/ww1/w1filter.cxx
b/sw/source/filter/ww1/w1filter.cxx
index 3659f88..ea38549 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1907,6 +1907,7 @@ void Ww1Picture::Out(Ww1Shell rOut, Ww1Manager /*rMan*/)
ReadDIB(aBmp, aOut, true);
pGraphic = new Graphic(aBmp);
}
+//fall-through
default:
OSL_ENSURE(pPic-mfp.mmGet() == 97, Ww1Picture);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unofield.cxx | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
New commits:
commit 40c8121fbeb89403418a90c77b88d13ad268d347
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Fri Mar 21 12:32:09 2014 +
Resolves: #i124474# on change of User Field via UNO-API...
trigger update to get dependent Input Fields updated.
(cherry picked from commit fc0c91c2d00157cb02cbe7b1d09cb950762e8145)
Conflicts:
sw/source/core/unocore/unofield.cxx
Change-Id: I0ead765729c93992103baca53924b7a127936b38
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 044dcb1..a416963 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -577,18 +577,29 @@ throw (beans::UnknownPropertyException,
beans::PropertyVetoException,
}
}
}
-if( bSetValue )
+if ( bSetValue )
{
// nothing special to be done here for the properties
// UNO_NAME_DATA_BASE_NAME and UNO_NAME_DATA_BASE_URL.
// We just call PutValue (empty string is allowed).
// Thus the last property set will be used as Data Source.
-sal_uInt16 nMId = GetFieldTypeMId( rPropertyName, *pType );
-if( USHRT_MAX != nMId )
-pType-PutValue( rValue, nMId );
+const sal_uInt16 nMemberValueId = GetFieldTypeMId( rPropertyName,
*pType );
+if ( USHRT_MAX != nMemberValueId )
+{
+pType-PutValue( rValue, nMemberValueId );
+if ( pType-Which() == RES_USERFLD )
+{
+// trigger update of User field in order to get depending
Input Fields updated.
+pType-UpdateFlds();
+}
+}
else
-throw beans::UnknownPropertyException(OUString( Unknown
property: ) + rPropertyName, static_cast cppu::OWeakObject * ( this ) );
+{
+throw beans::UnknownPropertyException(
+OUString( Unknown property: ) + rPropertyName,
+static_cast cppu::OWeakObject * ( this ) );
+}
}
}
else if (!pType m_pImpl-m_pDoc rPropertyName == UNO_NAME_NAME)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fc/0c91c2d00157cb02cbe7b1d09cb950762e8145
fc/0c91c2d00157cb02cbe7b1d09cb950762e8145 |1 + 1 file changed, 1 insertion(+) New commits: commit b46b2b259af29e1f3889cbde626357232189b7dd Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 16:26:06 2014 + Notes added by 'git notes add' diff --git a/fc/0c91c2d00157cb02cbe7b1d09cb950762e8145 b/fc/0c91c2d00157cb02cbe7b1d09cb950762e8145 new file mode 100644 index 000..204788e --- /dev/null +++ b/fc/0c91c2d00157cb02cbe7b1d09cb950762e8145 @@ -0,0 +1 @@ +merged as: 40c8121fbeb89403418a90c77b88d13ad268d347 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/Library_svxcore.mk svx/source
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx |4
svx/Library_svxcore.mk |3 ---
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |3 ---
3 files changed, 10 deletions(-)
New commits:
commit 10be411f33c69db83cc5de410eaddf2d297608ae
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Mar 21 17:34:19 2014 +0100
Remove opengl usage from svx until we can't solve building problems
Change-Id: I45b2e0f772f7bcc47bc2e0ce2c7639ef775b379b
diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
index 00e1dff..8781aa4 100644
--- a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
#include svx/sdr/contact/viewobjectcontactofsdrobj.hxx
-#include vcl/OpenGLContext.hxx
class Window;
@@ -26,9 +25,6 @@ public:
protected:
Window* getWindow() const;
-
-private:
-OpenGLContext m_aOpenGLContext;
};
} // namespace sdr
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index b3c3521..f26479c 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
utl \
vcl \
xo \
-$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
$(gb_UWINAPI) \
))
@@ -83,8 +82,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \
icuuc \
icu_headers \
- mesa_headers \
- glew \
))
$(eval $(call gb_Library_add_exception_objects,svxcore,\
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index 1689468..2cf0086 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -18,9 +18,6 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
ObjectContact rObjectContact, ViewContact rViewContact )
: ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
{
-m_aOpenGLContext.init(getWindow());
-// Set a dummy size to make the window visible
-m_aOpenGLContext.setWinSize(Size(200,200));
}
ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - linguistic/source sd/uiconfig vcl/source
linguistic/source/lngsvcmgr.cxx |2 +-
sd/uiconfig/simpress/ui/slidetransitionspanel.ui |1 -
vcl/source/control/field.cxx |7 +--
3 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 3b1cca8c547ce53b2af29b3edecc22c7694a0621
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 16:57:27 2014 +
Related: fdo#74468 drop hard-coded 'sec' and use FUNIT_SECONDS
Change-Id: I11e2aa39d77c01446387b13ba4bc9f40b61a958a
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 2d7bde2..52836f3 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -255,7 +255,6 @@
property name=can_focusTrue/property
property name=invisible_charâ/property
property name=invisible_char_setTrue/property
-property name=formatsec/property
property name=digits2/property
property name=spin_size25/property
/object
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index ad67f9f..bd60588 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1592,12 +1592,7 @@ Size MetricField::CalcMinimumSize() const
bool MetricField::set_property(const OString rKey, const OString rValue)
{
-if (rKey == format)
-{
-maCustomUnitText = OStringToOUString(rValue, RTL_TEXTENCODING_UTF8);
-meUnit = FUNIT_CUSTOM;
-}
-else if (rKey == digits)
+if (rKey == digits)
SetDecimalDigits(rValue.toInt32());
else if (rKey == spin-size)
SetSpinSize(rValue.toInt32());
commit 973ff09ee7e7a1926326db6accf9e3e40e901874
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 21 16:25:18 2014 +
coverity#982461 Unchecked dynamic_cast
Change-Id: I3933b2cd03b8e1dff7bcb106d841a429e4d0ba53
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 041cea7..014c3ec 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1021,7 +1021,7 @@ void LngSvcMgr::GetGrammarCheckerDsp_Impl( sal_Bool
bSetSvcList )
pGrammarDsp= dynamic_cast GrammarCheckingIterator *
(xGCI.get());
xGrammarDsp= xGCI;
SAL_WARN_IF( pGrammarDsp == NULL, linguistic, failed to get
implementation );
-if (bSetSvcList)
+if (bSetSvcList pGrammarDsp)
SetCfgServiceLists( *pGrammarDsp );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Is property name=format localizable?
On Thu, 2014-03-20 at 21:43 +0100, Andras Timar wrote: Hi Caolan, In sd/uiconfig/simpress/ui/slidetransitionspanel.ui I found a new property type: property name=formatsec/property. On UI it shows as 0.00sec. I wonder, if it is translatable, and if not, how can we make it translatable. I'm asking, because a few lines earlier there was object class=GtkSpinButton id=auto_after_value:0sec, which suggests that sec is hardcoded. How about now after 3b1cca8c547ce53b2af29b3edecc22c7694a0621 ? The format attribute was an idea I was playing around with at the start of widget layout but abandoned in favor of the :unit hack, but its use crept back in with 78ff9d90f2a74792c437087ede11559c111c5c98. AFAICS that is the only .ui that used the format attribute so I've removed support for the attribute now. The unit hack (unlike format) detects :sec and set FUNIT_SECOND and that should go through the correct get seconds translation route already. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: psprint_config/configuration psprint_config/Makefile psprint_config/Module_psprint_config.mk psprint_config/Package_fontunxppds.mk psprint_config/Package_fontunxpsprint
RepositoryModule_host.mk |1 psprint_config/Makefile |7 psprint_config/Module_psprint_config.mk | 26 psprint_config/Package_fontunxppds.mk | 26 psprint_config/Package_fontunxpsprint.mk | 25 psprint_config/README |5 psprint_config/configuration/ppds/SGENPRT.PS | 582 -- psprint_config/configuration/ppds/SGENT42.PS | 24 psprint_config/configuration/psprint.conf | 99 --- scp2/source/ooo/file_extra_ooo.scp|8 vcl/Module_vcl.mk |2 vcl/Package_fontunxppds.mk| 26 vcl/Package_fontunxpsprint.mk | 25 vcl/unx/generic/printer/configuration/README |5 vcl/unx/generic/printer/configuration/ppds/SGENPRT.PS | 582 ++ vcl/unx/generic/printer/configuration/ppds/SGENT42.PS | 24 vcl/unx/generic/printer/configuration/psprint.conf| 99 +++ 17 files changed, 765 insertions(+), 801 deletions(-) New commits: commit e3d9b3406a2013cd4f9d4baf3a7800d1d95c2d90 Author: Khaled Hosny khaledho...@eglug.org Date: Fri Mar 21 15:27:33 2014 +0200 Fold psprint_config into vcl The files are only used by the psprint stuff in vcl, so move them closer to it. We should kill all of this anyway, but that is for another day. Change-Id: Ie3b893c92d556333c9d8b041859d5e97604ace10 Reviewed-on: https://gerrit.libreoffice.org/8694 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 88119fc..6e3b90b 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ oox \ package \ postprocess \ - psprint_config \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ readlicense_oo \ diff --git a/psprint_config/Makefile b/psprint_config/Makefile deleted file mode 100644 index ccb1c85..000 --- a/psprint_config/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST - -include $(module_directory)/../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/psprint_config/Module_psprint_config.mk b/psprint_config/Module_psprint_config.mk deleted file mode 100644 index 041d7d1..000 --- a/psprint_config/Module_psprint_config.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the License); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_Module_Module,psprint_config)) - -$(eval $(call gb_Module_add_targets,psprint_config,\ - Package_fontunxppds \ - Package_fontunxpsprint \ -)) - -# vim: set noet sw=4: diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index ced1389..69eed78 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -81,19 +81,15 @@ File gid_File_Extra_Fontunxppds Dir = FILELIST_DIR; TXT_FILE_BODY; Styles = (FILELIST); -Name = psprint_config_fontunxppds.filelist; +Name = vcl_fontunxppds.filelist; End #endif -#endif - -#ifdef UNX - File gid_File_Extra_Fontunxpsprint Dir = FILELIST_DIR; TXT_FILE_BODY; Styles = (FILELIST, CONFIGFILE); -Name = psprint_config_fontunxpsprint.filelist; +Name = vcl_fontunxpsprint.filelist; End #endif diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index bb2ad3b..fb5d04b 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -41,6 +41,8 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_gen \ Library_desktop_detector \ StaticLibrary_headless \ +Package_fontunxppds \ +Package_fontunxpsprint \ )) ifneq ($(ENABLE_GTK),) diff --git a/psprint_config/Package_fontunxppds.mk b/vcl/Package_fontunxppds.mk similarity index 80% rename from psprint_config/Package_fontunxppds.mk rename to
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/printareasdialog.ui | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) New commits: commit 9ae556c626da301f3798c33dc7632c7c891f2a04 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 17:14:44 2014 + Related: fdo#76457 set the edit fields to expand the buttons remain too narrow, but that seems to be the case for all the formula buttons Change-Id: Ib7ecc6dffeed23459eddb1fc98140faf1a26296d diff --git a/sc/uiconfig/scalc/ui/printareasdialog.ui b/sc/uiconfig/scalc/ui/printareasdialog.ui index d52ef6d..e0b1f50 100644 --- a/sc/uiconfig/scalc/ui/printareasdialog.ui +++ b/sc/uiconfig/scalc/ui/printareasdialog.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=PrintAreasDialog property name=can_focusFalse/property @@ -72,24 +73,28 @@ object class=GtkBox id=box1 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=orientationvertical/property property name=spacing12/property child object class=GtkFrame id=printframe property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=label_xalign0/property property name=shadow_typenone/property child object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=top_padding6/property property name=left_padding12/property child object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=row_spacing6/property property name=column_spacing12/property child @@ -112,6 +117,7 @@ object class=foruilo-RefEdit id=edprintarea property name=visibleTrue/property property name=can_focusTrue/property +property name=hexpandTrue/property property name=invisible_charâ/property property name=width_chars50/property /object @@ -126,8 +132,6 @@ object class=GtkComboBoxText id=lbprintarea property name=visibleTrue/property property name=can_focusFalse/property -property name=entry_text_column0/property -property name=id_column1/property items item translatable=yes- none -/item item translatable=yes- entire sheet -/item @@ -167,24 +171,28 @@ object class=GtkFrame id=rowframe property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=label_xalign0/property property name=shadow_typenone/property child object class=GtkAlignment id=alignment2 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=top_padding6/property property name=left_padding12/property child object class=GtkGrid id=grid2 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=row_spacing6/property property name=column_spacing12/property child object class=foruilo-RefEdit id=edrepeatrow property name=visibleTrue/property property name=can_focusTrue/property +property name=hexpandTrue/property property name=invisible_charâ/property property name=width_chars50/property /object
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
sw/source/filter/ww8/docxattributeoutput.cxx | 13 +
3 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 5ff0e274bb146bbaede31e9e349cba301137d4f2
Author: Rajashri rajashri.udh...@synerzip.com
Date: Thu Mar 20 13:27:17 2014 +0530
fdo#76361 : LO crash: LO crashes while saving the document to docx
The document contains an empty table with borders.
LO was treating this table as a nested table, which lead to
a TC tag mismatch.
In docxattributeoutput.cxx, inside 'switchHeaderFooter'
added a check against 'm_oldTableReference-m_pOldTablepInner'
For some documents, even if the above value was null, still
it was getting assigned to 'm_tableReference' . Thus in such situations
it leads to a crash.
Change-Id: I883267585cb804f961989797de57c4b843b96821
Reviewed-on: https://gerrit.libreoffice.org/8677
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx
b/sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx
new file mode 100644
index 000..6d890ac
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/TCTagMisMatch.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a1542d9..966e52c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2887,6 +2887,18 @@ DECLARE_OOXMLEXPORT_TEST(test76108, test76108.docx)
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:fldChar[1], fldCharType, begin);
}
+DECLARE_OOXMLEXPORT_TEST(testTCTagMisMatch, TCTagMisMatch.docx)
+{
+ // TCTagMisMatch.docx : This document contains a empty table with borders.
+ // there was a TC tag mismatch which resulted into a crash.
+
+ xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+ if(!pXmlDoc)
+ return;
+
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]/w:tr[1]/w:tc[1],0);
+ assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1], 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testHyperLinkTagEnded, fdo76316.docx)
{
/* XML tag w:hyperlink was not getting closed when its inside another
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a088367..e287f71 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2489,10 +2489,15 @@ void DocxAttributeOutput::switchHeaderFooter(bool
isHeaderFooter, sal_Int32 inde
}
else if( index == -1)
{
-*m_tableReference = *m_oldTableReference;
-//Reset the oldReference, after copying it back to the original.
-m_oldTableReference-m_bTableCellOpen = false ;
-m_oldTableReference-m_nTableDepth = 0;
+ if (m_oldTableReference-m_pOldTablepInner)
+ {
+ *m_tableReference = *m_oldTableReference;
+
+//Reset the oldReference, after copying it back to the original.
+m_oldTableReference-m_bTableCellOpen = false ;
+m_oldTableReference-m_nTableDepth = 0;
+ }
+
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excimp8.cxx | 14 ++---
sc/source/filter/excel/xicontent.cxx | 51 ++-
sc/source/filter/excel/xladdress.cxx |7 +++-
sc/source/filter/inc/xicontent.hxx | 30 ++--
sc/source/filter/inc/xladdress.hxx |2 -
5 files changed, 21 insertions(+), 83 deletions(-)
New commits:
commit 0f2414d82c0a4b4aca9ef040d617dcc7554a8fc5
Author: Eike Rathke er...@redhat.com
Date: Fri Mar 21 18:46:37 2014 +0100
refactored to use XclRangeList and XclImpAddressConverter
Change-Id: If0455f0243aace784c704e234469709e6da4542f
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index 4ffc326..2a52df8 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -354,12 +354,16 @@ void ImportExcel8::Feat( void )
aIn.Ignore(4); // size if EXC_ISFFEC2, else 0 and
to be ignored
aIn.Ignore(2); // reserved3 (2 bytes)
-XclEnhancedProtection aProt;
-aProt.maRefs.reserve( nCref);
-XclRef8U aRef;
-for (sal_uInt16 i=0; i nCref aIn.IsValid(); ++i)
+ScEnhancedProtection aProt;
+if (nCref)
{
-aProt.maRefs.push_back( aRef.read( aIn));
+XclRangeList aRefs;
+aRefs.Read( aIn, true, nCref);
+if (!aRefs.empty())
+{
+aProt.maRangeList = new ScRangeList;
+GetAddressConverter().ConvertRangeList( *aProt.maRangeList, aRefs,
GetCurrScTab(), false);
+}
}
// FeatProtection structure follows in record.
diff --git a/sc/source/filter/excel/xicontent.cxx
b/sc/source/filter/excel/xicontent.cxx
index bc27a29..bb5ec44 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -65,39 +65,6 @@ using ::com::sun::star::uno::Sequence;
using ::std::auto_ptr;
-const XclRef8U XclRef8U::read( XclImpStream rStrm )
-{
-mnRow1 = rStrm.ReaduInt16();
-mnRow2 = rStrm.ReaduInt16();
-mnCol1 = rStrm.ReaduInt16();
-mnCol2 = rStrm.ReaduInt16();
-return *this;
-}
-
-ScRange XclRef8U::convertToScRange( SCTAB nTab ) const
-{
-return ScRange( mnCol1, mnRow1, nTab, mnCol2, mnRow2, nTab);
-}
-
-ScEnhancedProtection XclEnhancedProtection::convertToScEnhancedProtection(
SCTAB nTab ) const
-{
-ScEnhancedProtection aProt;
-if (!maRefs.empty())
-{
-aProt.maRangeList = new ScRangeList;
-for (::std::vectorXclRef8U::const_iterator it(maRefs.begin()),
itEnd(maRefs.end()); it != itEnd; ++it)
-{
-aProt.maRangeList-Append( it-convertToScRange( nTab));
-}
-}
-aProt.mnAreserved = mnAreserved;
-aProt.mnPasswordVerifier = mnPasswordVerifier;
-aProt.maTitle = maTitle;
-aProt.maSecurityDescriptor = maSecurityDescriptor;
-return aProt;
-}
-
-
// Shared string table
XclImpSst::XclImpSst( const XclImpRoot rRoot ) :
@@ -1280,7 +1247,7 @@ void XclImpSheetProtectBuffer::ReadOptions( XclImpStream
rStrm, SCTAB nTab )
pSheet-mnOptions = nOptions;
}
-void XclImpSheetProtectBuffer::AppendEnhancedProtection( const
XclEnhancedProtection rProt, SCTAB nTab )
+void XclImpSheetProtectBuffer::AppendEnhancedProtection( const
ScEnhancedProtection rProt, SCTAB nTab )
{
Sheet* pSheet = GetSheetItem(nTab);
if (pSheet)
@@ -1338,23 +1305,11 @@ void XclImpSheetProtectBuffer::Apply() const
pProtect-setOption( ScTableProtection::PIVOT_TABLES,
(nOptions 0x2000) );
pProtect-setOption( ScTableProtection::SELECT_UNLOCKED_CELLS,
(nOptions 0x4000) );
-SCTAB nTab = itr-first;
-
// Enhanced protection containing editable ranges and permissions.
-if (!itr-second.maEnhancedProtections.empty())
-{
-::std::vectorScEnhancedProtection aProtections;
-for (::std::vectorXclEnhancedProtection::const_iterator
-it(itr-second.maEnhancedProtections.begin()),
itEnd(itr-second.maEnhancedProtections.end());
-it != itEnd; ++it)
-{
-aProtections.push_back( it-convertToScEnhancedProtection(
nTab));
-}
-pProtect-setEnhancedProtection( aProtections);
-}
+pProtect-setEnhancedProtection( itr-second.maEnhancedProtections);
// all done. now commit.
-GetDoc().SetTabProtection(nTab, pProtect.get());
+GetDoc().SetTabProtection(itr-first, pProtect.get());
}
}
diff --git a/sc/source/filter/excel/xladdress.cxx
b/sc/source/filter/excel/xladdress.cxx
index 694e1e0..237d0f7 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -93,10 +93,13 @@ XclRange XclRangeList::GetEnclosingRange() const
return aXclRange;
}
-void XclRangeList::Read( XclImpStream rStrm, bool bCol16Bit )
+void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/fontsubset/sft.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2f3adbdeb1219c3064e2654b5a84b7bcb2a91a4f Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 15:33:53 2014 + coverity#705966 Dereference before null check Change-Id: I74507ce67f928bdeb626d4070dbd2a45cc126521 (cherry picked from commit 511d8bbbec6bc95d92a3ac6bbac4c68622738706) Reviewed-on: https://gerrit.libreoffice.org/8697 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index f1bec51..91717b7 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2438,7 +2438,7 @@ bool GetSfntTable( TrueTypeFont* ttf, int nSubtableIndex, return false; *pRawLength = ttf-tlens[ nSubtableIndex ]; *ppRawBytes = ttf-tables[ nSubtableIndex ]; -bool bOk = (*pRawLength 0) (ppRawBytes != NULL); +bool bOk = (*pRawLength 0) (*ppRawBytes != NULL); return bOk; } ___ 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/fontsubset/sft.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc70d91713332676dd2b8aa77d67684258493b15 Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 21 15:33:53 2014 + coverity#705966 Dereference before null check Change-Id: I74507ce67f928bdeb626d4070dbd2a45cc126521 (cherry picked from commit 511d8bbbec6bc95d92a3ac6bbac4c68622738706) Reviewed-on: https://gerrit.libreoffice.org/8698 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 9880b7b..868e970 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2413,7 +2413,7 @@ bool GetSfntTable( TrueTypeFont* ttf, int nSubtableIndex, return false; *pRawLength = ttf-tlens[ nSubtableIndex ]; *ppRawBytes = ttf-tables[ nSubtableIndex ]; -bool bOk = (*pRawLength 0) (ppRawBytes != NULL); +bool bOk = (*pRawLength 0) (*ppRawBytes != NULL); return bOk; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excimp8.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 80652a80da6f86974a2ce0b0367d27a5e797b85d Author: Eike Rathke er...@redhat.com Date: Fri Mar 21 18:57:24 2014 +0100 always resize vector, reserve is just that Change-Id: I6e6c54e5e6ee87039b8337258bb78da2f0201d06 diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 2a52df8..75bc1bb 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -377,8 +377,7 @@ void ImportExcel8::Feat( void ) // TODO: could here be some sanity check applied to not allocate 4GB? aProt.maSecurityDescriptor.reserve( nCbSD); sal_Size nRead = aIn.Read( aProt.maSecurityDescriptor.front(), nCbSD); -if (nRead != nCbSD) -aProt.maSecurityDescriptor.resize( nRead); +aProt.maSecurityDescriptor.resize( nRead); } GetSheetProtectBuffer().AppendEnhancedProtection( aProt, GetCurrScTab() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 72284, which changed state. Bug 72284 Summary: FILESAVE: Crashes when trying to save a particular docx file https://bugs.freedesktop.org/show_bug.cgi?id=72284 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- 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
Google Summer of Code 2014
Hi, I want to work for LibreOffice this GSoC on Refactor god objects. I submitted a proposal. Thanks! Cheers, TRINH Ngoc Khanh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 72284, which changed state. Bug 72284 Summary: FILESAVE: Crashes when trying to save a particular docx file https://bugs.freedesktop.org/show_bug.cgi?id=72284 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- -- 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
