[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/aqua
vcl/aqua/source/window/salframeview.mm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 67d28a26bc43fcf7e7455c006684d4282be5d560 Author: Tor Lillqvist Date: Tue Jun 18 18:12:09 2013 +0300 fdo#63547: Fix wheel/trackpad scrolling on OS X: Single char copy/paste error Change-Id: I06faa28c25e976d0c9e072858cbe37093a61d38d (cherry picked from commit 72703332ff42a70d19050d78a63286b9a9b6f930) Reviewed-on: https://gerrit.libreoffice.org/4499 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 5567260..6a53201 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -840,7 +840,7 @@ private: if( aEvent.mnDelta == 0 ) aEvent.mnDelta = aEvent.mnNotchDelta; aEvent.mbHorz = TRUE; -aEvent.mnScrollLines = dY > 0 ? dX/WHEEL_EVENT_FACTOR : -dX/WHEEL_EVENT_FACTOR; +aEvent.mnScrollLines = dX > 0 ? dX/WHEEL_EVENT_FACTOR : -dX/WHEEL_EVENT_FACTOR; if( aEvent.mnScrollLines == 0 ) aEvent.mnScrollLines = 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: LibreOffice Gerrit News 2013-06-25
Title: 인증페이지시안1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News 2013-06-25
Moin! * Open changes on master for project core changed in the last 25 hours: + coverity #982634 and 5 other : Intentional fallthrough in cases in https://gerrit.libreoffice.org/4498 from Norbert Thiebaud + coverity : #984128 and 21 others : Uninitialized scalar field in https://gerrit.libreoffice.org/4497 from Norbert Thiebaud + Finishing touch on Drop Caps widget UI conversion. in https://gerrit.libreoffice.org/4415 from Olivier Hallot + Always embed 14 standard Postscript fonts in PDF in https://gerrit.libreoffice.org/4495 from Khaled Hosny + fdo#55853 - improve parsing of concatenated numbers and identifiers. in https://gerrit.libreoffice.org/4494 from Frédéric Wang + ParaPropertyPanel: Sidebar conversion to .ui in https://gerrit.libreoffice.org/4364 from Prashant Pandey + fdo65400: fix for Character Shading being lost in https://gerrit.libreoffice.org/4452 from Adam CloudOn + AreaPropertyPanel: sidebar conversion to .ui in https://gerrit.libreoffice.org/4402 from Prashant Pandey + credits: add back "developers not committing code since 2010-09-28" in https://gerrit.libreoffice.org/4474 from Christian Lohmaier + replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann * Merged changes on master for project core changed in the last 25 hours: + Replace more characters functions with rtl/character.hxx in https://gerrit.libreoffice.org/4447 from Arnaud Versini + fdo#43460 framework,i18npool,accessibility: use isEmpty() in https://gerrit.libreoffice.org/4443 from Jelle van der Waa + fdo#43460 sd,rsc,ucb,sdext: use isEmpty() in https://gerrit.libreoffice.org/4442 from Jelle van der Waa + coverity#706154 : Destination buffer too small in https://gerrit.libreoffice.org/4410 from Norbert Thiebaud + fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer in https://gerrit.libreoffice.org/4051 from Akash Shetye + fdo#43460 svl: use isEmpty() in https://gerrit.libreoffice.org/4441 from Jelle van der Waa + fdo#65541: Proper EPM %requires dependencies, at least for Linux in https://gerrit.libreoffice.org/4344 from Stephan Bergmann + coverity#705766 Resource leak in https://gerrit.libreoffice.org/4409 from Norbert Thiebaud + coverity#705765: Resource leak in https://gerrit.libreoffice.org/4408 from Norbert Thiebaud + Robustify GraphicDescriptor::ImpDetect* reading SvStream. in https://gerrit.libreoffice.org/4469 from Mark Wielaard + Fix memory leak in SwTOXBaseSection::GenerateText. in https://gerrit.libreoffice.org/4470 from Mark Wielaard + fdo#56679, fdo#65710 : fix for import and export of underline color in https://gerrit.libreoffice.org/4459 from Adam CloudOn + fdo#43460 shell,vcl,xmlreader: use isEmpty() in https://gerrit.libreoffice.org/ from Jelle van der Waa + Add another fallback-path for wilangid.vbs in https://gerrit.libreoffice.org/4468 from Christian Lohmaier * Abandoned changes on master for project core changed in the last 25 hours: + fdo#39468 - translate German comments in https://gerrit.libreoffice.org/4079 from Thomas Arnhold + fix compilation error when compiling static libs with release optimizatio in https://gerrit.libreoffice.org/4453 from Tsahi Glik @ CloudOn + Resolved bug fdo#63766 in https://gerrit.libreoffice.org/3524 from gokul s * Open changes needing tweaks, but being untouched for more than a week: + fdo#43460 sc: use isEmpty() in https://gerrit.libreoffice.org/4316 from Jelle van der Waa + solve fdo#54819 in https://gerrit.libreoffice.org/3583 from Maxime de Roucy Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/source
sc/source/filter/inc/stylesbuffer.hxx | 24 -
sc/source/filter/inc/stylesfragment.hxx | 15 ++
sc/source/filter/oox/stylesbuffer.cxx | 45
sc/source/filter/oox/stylesfragment.cxx | 24 -
4 files changed, 106 insertions(+), 2 deletions(-)
New commits:
commit c0801d4dbda418835ad30c89fce8f2185a5fffe5
Author: Akash Shetye
Date: Tue Jun 25 11:24:34 2013 +0530
Adds support for table style tag reading and filling in the formatting
object
This patch contains the bulk of the style.xml parsing modifications to read
the and tags and fill in the
ScDBDataFormatting information.
Change-Id: Ic3981dcb29ee09b26940b51dd94d750603e1c4f4
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index 32b439c..10a18ab 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -36,6 +36,7 @@
#include
#include
#include "attarray.hxx"
+#include "dbdataformatting.hxx"
#include
class ScMarkData;
@@ -787,6 +788,23 @@ typedef ::boost::shared_ptr< Dxf > DxfRef;
//
+/* Contains attributes for table styles from the element */
+class TableStyle : public WorkbookHelper
+{
+public:
+explicitTableStyle( const WorkbookHelper& rHelper, const
OUString& rTableStyleName );
+voidimportTableStyleElement( const AttributeList& rAttribs
);
+voidfinalizeImport();
+private:
+typedef ::boost::shared_ptr< ::ScDBDataFormatting > TableFormattingRef;
+
+TableFormattingRef mxTableFormatting;
+};
+
+typedef ::boost::shared_ptr< TableStyle > TableStyleRef;
+
+//
+
/** Contains attributes of a cell style, e.g. from the cellStyle element. */
struct CellStyleModel
{
@@ -922,7 +940,9 @@ public:
/** Creates a new empty differential formatting object.
@param opnDxfId (out-param) The identifier of the new DXF object. */
DxfRef createDxf( sal_Int32* opnDxfId = 0 );
-
+/** Creates a new TableStyle object for storing table formatting.
+@param opnTableStyleId (out-param) The identifier of the new
TableStyle object. */
+TableStyleRef createTableStyle(const OUString& rTableStyleName,
sal_Int32* opnTableStyleId = 0 );
/** Appends a new color to the color palette. */
voidimportPaletteColor( const AttributeList& rAttribs );
/** Inserts a new number format code. */
@@ -997,6 +1017,7 @@ private:
typedef RefVector< Fill > FillVector;
typedef RefVector< Xf > XfVector;
typedef RefVector< Dxf >DxfVector;
+typedef RefVector< TableStyle > TableStyleVector;
typedef ::std::map< sal_Int32, OUString >DxfStyleMap;
ColorPalettemaPalette; /// Color palette.
@@ -1008,6 +1029,7 @@ private:
XfVectormaStyleXfs; /// List of cell styles.
CellStyleBuffer maCellStyles; /// All built-in and user defined
cell styles.
DxfVector maDxfs; /// List of differential cell
styles.
+TableStyleVectormaTableStyles;/// List of Table styles for
tables.
mutable DxfStyleMap maDxfStyles;/// Maps DXF identifiers to Calc
style sheet names.
};
diff --git a/sc/source/filter/inc/stylesfragment.hxx
b/sc/source/filter/inc/stylesfragment.hxx
index 5e8f177..43370af 100644
--- a/sc/source/filter/inc/stylesfragment.hxx
+++ b/sc/source/filter/inc/stylesfragment.hxx
@@ -124,6 +124,21 @@ private:
//
+class TableStyleContext : public WorkbookContextBase
+{
+public:
+template< typename ParentType >
+inline explicit TableStyleContext( ParentType& rParent, const
TableStyleRef& rxTableStyle ) :
+WorkbookContextBase( rParent ), mxTableStyle(
rxTableStyle ) {}
+protected:
+virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32
nElement, const AttributeList& rAttribs );
+
+private:
+TableStyleRef mxTableStyle;
+};
+
+//
+
class StylesFragment : public WorkbookFragmentBase
{
public:
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index cead31d..5428a34 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2649,6 +2649,41 @@ void Dxf::writeToPropertySet( PropertySet& rPropSet )
const
//
+TableStyle::TableStyle( const WorkbookHelper& rHelper, const OUString&
rTableStyleName ) :
+Workbo
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/menu/mnuitem.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit b3962c92bfb8d14d908bfeb9142548e9686ee105
Author: Tor Lillqvist
Date: Tue Jun 25 08:52:28 2013 +0300
WaE: unused variable 'aText' [loplugin]
Change-Id: I846030c5c7ad4e30e5286d1ee30130a397ad4daa
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 6530c88..f27a388 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -301,8 +301,6 @@ SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
: SfxMenuControl( nPos, rBindings ), pMenu(0)
{
-String aText = rMenu.GetItemText( nPos );
-
// Determine the current background color setting for menus
const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
m_nSymbolsStyle = rSettings.GetSymbolsStyle();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO / Firebird DB Integration
Hi, On Mon, Jun 24, 2013 at 03:19:32PM +0100, Andrzej J. R. Hunt wrote: > On 24/06/13 12:25, David Tardon wrote: > > If this is the current option, could we please consider the possibility > > to drop the whole idea and just stay with hsqldb? With my distro hat on, > > I do not see any improvement with having to bundle hsqldb vs. having to > > bundle firebird. > The main motivation for the switch was (another step in) getting rid of > java (at least for me personally it is, and AFAICS for most other people > too), and not the bundling of a db. IMHO that is a wrong reason. We should be choosing another DB because 1/ it promises a good backwards compatibility of its data format (so the ODB created with one version of the DB can be opened with newer versions) and 2/ it does not force us to use a specific configuration to achieve 1/ (so we are not forced to bundle the DB), not because "it is not java". Getting rid of another java dependency should be just a nice side effect. > And there appear to be solutions to > allow reliable use of external firebird with various ICUs (see mails > from Lionel/Michael) -- so either way firebird still makes the most > sense to me. _If_ it can be done, great, and I am all for firebird. But if it cannot, I would much rather stay with hsqldb. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/inc sc/source
sc/inc/dbdataformatting.hxx |2 +-
sc/source/core/tool/dbdataformatting.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7dc6bebf681e99c4335f95e8f3265b0e5dc5694a
Author: Akash Shetye
Date: Tue Jun 25 11:14:31 2013 +0530
Fixes commit f502c0ea6826fc0e915d8d4c302fe978a4d43a58 that breaks the build.
Change-Id: Ib815dfb3679627c9d99ef747b7b0ef643b7e0cbb
diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
index ef8d5fd..50d62f5 100644
--- a/sc/inc/dbdataformatting.hxx
+++ b/sc/inc/dbdataformatting.hxx
@@ -33,7 +33,7 @@ class SC_DLLPUBLIC ScDBDataFormatting
bool bBandedColumns;
public:
ScDBDataFormatting();
-ScDBDataFormatting(const OUString& rFirstRowStripeStyle, const
OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const
OUString& rSecondColStripeStyle, bool bBRows, bool bBCols);
+ScDBDataFormatting(const OUString& rTableStyleName, const OUString&
rFirstRowStripeStyle, const OUString& rSecondRowStripeStyle, const OUString&
rFirstColStripeStyle, const OUString& rSecondColStripeStyle, bool bBRows, bool
bBCols);
ScDBDataFormatting( const ScDBDataFormatting& rTableFormatData );
void SetTableStyleName( const OUString& rTableStyleName );
const OUString& GetTableStyleName();
diff --git a/sc/source/core/tool/dbdataformatting.cxx
b/sc/source/core/tool/dbdataformatting.cxx
index fe6a8a2..24fde5e 100644
--- a/sc/source/core/tool/dbdataformatting.cxx
+++ b/sc/source/core/tool/dbdataformatting.cxx
@@ -53,7 +53,7 @@ void ScDBDataFormatting::SetTableStyleName( const OUString&
rTableStyleName )
const OUString& ScDBDataFormatting::GetTableStyleName()
{
-return maTbleStyleName;
+return maTableStyleName;
}
void ScDBDataFormatting::SetBandedRows( bool bBRows )
___
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/gdi/metaact.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 692fa32997217d2357a5a6d36852090eb57ebeb8
Author: Julien Nabet
Date: Tue Jun 25 07:30:57 2013 +0200
Fix local var non initialized
Change-Id: I096742a1849d7fc8310aac8addd18b15cc40fea3
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 64664d5..b8725eb 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -154,7 +154,7 @@ void MetaAction::Read( SvStream& rIStm, ImplMetaReadData* )
MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData*
pData )
{
MetaAction* pAction = NULL;
-sal_uInt16 nType;
+sal_uInt16 nType = 0;
rIStm >> nType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - sc/inc sc/source
sc/inc/dociter.hxx |1 -
sc/source/core/data/column.cxx |5 ++---
sc/source/core/data/column3.cxx |5 +
sc/source/core/data/dociter.cxx |2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit bfe4ea0d11d3ca83eed00b71394072c6049d7566
Author: Tor Lillqvist
Date: Tue Jun 25 07:20:56 2013 +0300
WaE: private field 'mnIndex' is not used
Change-Id: If8c9b4bf1041881bb8fb92c51e2bce22909147c5
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 9458aae..23e310d 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -198,7 +198,6 @@ class ScCellIterator
ScAddress maCurPos;
PositionType maCurColPos;
-SCSIZE mnIndex;
bool mbSubTotal;
ScRefCellValue maCurCell;
commit 022c54742e7997bf46a608f1ab0b500f2537f7f5
Author: Tor Lillqvist
Date: Tue Jun 25 07:19:41 2013 +0300
WaE: private field 'mrCells' is not used
Change-Id: I0ab3fabb82c839f5194b0e20eb834dd86635a609
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 1aae1e5..11c4474 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1831,13 +1831,12 @@ namespace {
class StrCellIterator
{
typedef std::pair PosType;
-const sc::CellStoreType& mrCells;
PosType maPos;
sc::CellStoreType::const_iterator miBeg;
sc::CellStoreType::const_iterator miEnd;
public:
StrCellIterator(const sc::CellStoreType& rCells, SCROW nStart) :
-mrCells(rCells), maPos(rCells.position(nStart)),
miBeg(rCells.begin()), miEnd(rCells.end()) {}
+maPos(rCells.position(nStart)), miBeg(rCells.begin()),
miEnd(rCells.end()) {}
bool valid() const { return (maPos.first != miEnd); }
commit ab86388c85f085adfe1edfe21a8ee8500a68449f
Author: Tor Lillqvist
Date: Tue Jun 25 07:18:21 2013 +0300
WaE: private field 'mbDateTime' is not used
Change-Id: I29967aa15b879cc96cccb686814e594526b200d5
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c85f914..1aae1e5 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -502,7 +502,6 @@ class DeleteAreaHandler
sc::SingleColumnSpanSet maDeleteRanges;
bool mbNumeric:1;
-bool mbDateTime:1;
bool mbString:1;
bool mbFormula:1;
@@ -510,7 +509,6 @@ public:
DeleteAreaHandler(ScDocument& rDoc, sal_uInt16 nDelFlag) :
mrDoc(rDoc),
mbNumeric(nDelFlag & IDF_VALUE),
-mbDateTime(nDelFlag & IDF_DATETIME),
mbString(nDelFlag & IDF_STRING),
mbFormula(nDelFlag & IDF_FORMULA) {}
commit a31cea1be6bcad3d823ebecd7456ecb76368ed10
Author: Tor Lillqvist
Date: Tue Jun 25 07:17:05 2013 +0300
WaE: implicit conversion of NULL constant to 'bool'
Change-Id: I1cbfa318e75ac5c86c0c7d2dbc033601fec3d46c
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 3fa15cf..b5c36b8 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1132,7 +1132,7 @@ bool ScQueryCellIterator::GetThis()
do
{
if ( ++nCol > mpParam->nCol2 )
-return NULL; // Over and out
+return false; // Over and out
if ( bAdvanceQuery )
{
AdvanceQueryParamEntryField();
commit 88d953565b44ccc4b3c00e1d0e343a91cb879313
Author: Tor Lillqvist
Date: Tue Jun 25 07:15:56 2013 +0300
WaE: private field 'mrAttrs' is not used
Change-Id: I3b87820eee8182e6c4b36d62acfe90cabd830c86
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9dc41b1..8cc4786 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2499,12 +2499,11 @@ struct ResetChangedHandler
class FindEditCellsHandler
{
ScColumn& mrColumn;
-sc::CellTextAttrStoreType& mrAttrs;
sc::CellTextAttrStoreType::iterator miAttrPos;
public:
FindEditCellsHandler(ScColumn& rColumn, sc::CellTextAttrStoreType& rAttrs)
:
-mrColumn(rColumn), mrAttrs(rAttrs), miAttrPos(rAttrs.begin()) {}
+mrColumn(rColumn), miAttrPos(rAttrs.begin()) {}
bool operator() (size_t, const EditTextObject*)
{
commit 3c87f574f7487d94f05cd95ac1cc26a4953dc6ec
Author: Tor Lillqvist
Date: Tue Jun 25 07:14:42 2013 +0300
WaE: unused variable 'itEnd'
Change-Id: Idec79adce1f4bbb4003b3e8fb76a1f4a40fcc13f
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index bd1eeae..9dc41b1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1174,7 +1174,7 @@ bool ScColumn::TestInsertRow( SCROW nStartRow, SCSIZE
nSize ) const
// Find the position of the last non-empty cell below nStartRow.
size_t nLastNonEmptyRow = MAXROW;
-sc::CellStoreType::const_reverse_iterator it = maCells.rbegin(), itEnd =
maCells.rend();
+sc::CellStoreType::const
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/inc sc/source
sc/inc/column.hxx|1
sc/inc/document.hxx |2
sc/inc/table.hxx |2
sc/source/core/data/column2.cxx | 156 +++
sc/source/core/data/documen8.cxx | 19
sc/source/core/data/table1.cxx |7 +
sc/source/core/tool/interpr5.cxx | 125 ---
7 files changed, 188 insertions(+), 124 deletions(-)
New commits:
commit c0e2ebf6539ab64d2ec59185abfa58e648e584d7
Author: Kohei Yoshida
Date: Tue Jun 25 00:03:11 2013 -0400
Use double and string arrays directly when creating matrix from cells.
Change-Id: Ib251075418baeb7d884696c54504b8851bc9f65e
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e7c58c1..79c37fc 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -442,6 +442,7 @@ public:
ScFormulaVectorState GetFormulaVectorState( SCROW nRow ) const;
formula::FormulaTokenRef ResolveStaticReference( SCROW nRow );
bool ResolveStaticReference( ScMatrix& rMat, SCCOL nMatCol, SCROW nRow1,
SCROW nRow2 );
+void FillMatrix( ScMatrix& rMat, size_t nMatCol, SCROW nRow1, SCROW nRow2
) const;
const double* FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW
nRow1, SCROW nRow2 ) const;
void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 489dca2..2166898 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1713,6 +1713,8 @@ public:
*/
bool IsEmptyData( SCTAB nTab, SCCOL nCol ) const;
+void FillMatrix( ScMatrix& rMat, SCTAB nTab, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 ) const;
+
private:
ScDocument(const ScDocument& r); // disabled with no definition
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 65cb180..fe88f09 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -845,6 +845,8 @@ public:
void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol,
SCROW nRow1, SCROW nRow2 );
bool HasBroadcaster( SCCOL nCol ) const;
+void FillMatrix( ScMatrix& rMat, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2 ) const;
+
/** Replace behaves differently to the Search; adjust the rCol and rRow
accordingly.
'Replace' replaces at the 'current' position, but in order to achieve
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5c4419b..8dae8d6 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1902,6 +1902,162 @@ bool ScColumn::ResolveStaticReference( ScMatrix& rMat,
SCCOL nMatCol, SCROW nRow
return aFunc.isSuccess();
}
+namespace {
+
+struct CellBucket
+{
+SCSIZE mnNumValStart;
+SCSIZE mnStrValStart;
+std::vector maNumVals;
+std::vector maStrVals;
+
+CellBucket() : mnNumValStart(0), mnStrValStart(0) {}
+
+void flush(ScMatrix& rMat, SCSIZE nCol)
+{
+if (!maNumVals.empty())
+{
+const double* p = &maNumVals[0];
+rMat.PutDouble(p, maNumVals.size(), nCol, mnNumValStart);
+reset();
+}
+else if (!maStrVals.empty())
+{
+const OUString* p = &maStrVals[0];
+rMat.PutString(p, maStrVals.size(), nCol, mnStrValStart);
+reset();
+}
+}
+
+void reset()
+{
+mnNumValStart = mnStrValStart = 0;
+maNumVals.clear();
+maStrVals.clear();
+}
+};
+
+class FillMatrixHandler
+{
+ScMatrix& mrMat;
+size_t mnMatCol;
+size_t mnTopRow;
+
+SCCOL mnCol;
+SCTAB mnTab;
+
+public:
+FillMatrixHandler(ScMatrix& rMat, size_t nMatCol, size_t nTopRow, SCCOL
nCol, SCTAB nTab) :
+mrMat(rMat), mnMatCol(nMatCol), mnTopRow(nTopRow), mnCol(nCol),
mnTab(nTab) {}
+
+void operator() (const sc::CellStoreType::value_type& node, size_t
nOffset, size_t nDataSize)
+{
+size_t nMatRow = node.position + nOffset - mnTopRow;
+
+switch (node.type)
+{
+case sc::element_type_numeric:
+{
+const double* p = &sc::numeric_block::at(*node.data, nOffset);
+mrMat.PutDouble(p, nDataSize, mnMatCol, nMatRow);
+}
+break;
+case sc::element_type_string:
+{
+const OUString* p = &sc::string_block::at(*node.data, nOffset);
+mrMat.PutString(p, nDataSize, mnMatCol, nMatRow);
+}
+break;
+case sc::element_type_edittext:
+{
+std::vector aStrs;
+aStrs.reserve(nDataSize);
+sc::edittext_block::const_iterator it =
sc::edittext_block::begin(*node.data);
+std::advance(it, nOffset);
+sc::edittext_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+for (; it != itEnd; ++it)
+aStrs.push_back(ScEditUtil::GetString(**it));
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx|1
sc/inc/document.hxx |2
sc/inc/table.hxx |2
sc/source/core/data/column2.cxx | 156 +++
sc/source/core/data/documen8.cxx | 19
sc/source/core/data/table1.cxx |7 +
sc/source/core/tool/interpr5.cxx | 125 ---
7 files changed, 188 insertions(+), 124 deletions(-)
New commits:
commit 792aa859ca22aa151dd2e3bfc9dd570cd2717731
Author: Kohei Yoshida
Date: Tue Jun 25 00:03:11 2013 -0400
Use double and string arrays directly when creating matrix from cells.
Change-Id: Ib251075418baeb7d884696c54504b8851bc9f65e
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e7c58c1..79c37fc 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -442,6 +442,7 @@ public:
ScFormulaVectorState GetFormulaVectorState( SCROW nRow ) const;
formula::FormulaTokenRef ResolveStaticReference( SCROW nRow );
bool ResolveStaticReference( ScMatrix& rMat, SCCOL nMatCol, SCROW nRow1,
SCROW nRow2 );
+void FillMatrix( ScMatrix& rMat, size_t nMatCol, SCROW nRow1, SCROW nRow2
) const;
const double* FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW
nRow1, SCROW nRow2 ) const;
void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 08c4ab6..5069ccc 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1701,6 +1701,8 @@ public:
*/
bool IsEmptyData( SCTAB nTab, SCCOL nCol ) const;
+void FillMatrix( ScMatrix& rMat, SCTAB nTab, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 ) const;
+
private:
ScDocument(const ScDocument& r); // disabled with no definition
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 65cb180..fe88f09 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -845,6 +845,8 @@ public:
void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol,
SCROW nRow1, SCROW nRow2 );
bool HasBroadcaster( SCCOL nCol ) const;
+void FillMatrix( ScMatrix& rMat, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2 ) const;
+
/** Replace behaves differently to the Search; adjust the rCol and rRow
accordingly.
'Replace' replaces at the 'current' position, but in order to achieve
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5a0badf..a946e93 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1899,6 +1899,162 @@ bool ScColumn::ResolveStaticReference( ScMatrix& rMat,
SCCOL nMatCol, SCROW nRow
return aFunc.isSuccess();
}
+namespace {
+
+struct CellBucket
+{
+SCSIZE mnNumValStart;
+SCSIZE mnStrValStart;
+std::vector maNumVals;
+std::vector maStrVals;
+
+CellBucket() : mnNumValStart(0), mnStrValStart(0) {}
+
+void flush(ScMatrix& rMat, SCSIZE nCol)
+{
+if (!maNumVals.empty())
+{
+const double* p = &maNumVals[0];
+rMat.PutDouble(p, maNumVals.size(), nCol, mnNumValStart);
+reset();
+}
+else if (!maStrVals.empty())
+{
+const OUString* p = &maStrVals[0];
+rMat.PutString(p, maStrVals.size(), nCol, mnStrValStart);
+reset();
+}
+}
+
+void reset()
+{
+mnNumValStart = mnStrValStart = 0;
+maNumVals.clear();
+maStrVals.clear();
+}
+};
+
+class FillMatrixHandler
+{
+ScMatrix& mrMat;
+size_t mnMatCol;
+size_t mnTopRow;
+
+SCCOL mnCol;
+SCTAB mnTab;
+
+public:
+FillMatrixHandler(ScMatrix& rMat, size_t nMatCol, size_t nTopRow, SCCOL
nCol, SCTAB nTab) :
+mrMat(rMat), mnMatCol(nMatCol), mnTopRow(nTopRow), mnCol(nCol),
mnTab(nTab) {}
+
+void operator() (const sc::CellStoreType::value_type& node, size_t
nOffset, size_t nDataSize)
+{
+size_t nMatRow = node.position + nOffset - mnTopRow;
+
+switch (node.type)
+{
+case sc::element_type_numeric:
+{
+const double* p = &sc::numeric_block::at(*node.data, nOffset);
+mrMat.PutDouble(p, nDataSize, mnMatCol, nMatRow);
+}
+break;
+case sc::element_type_string:
+{
+const OUString* p = &sc::string_block::at(*node.data, nOffset);
+mrMat.PutString(p, nDataSize, mnMatCol, nMatRow);
+}
+break;
+case sc::element_type_edittext:
+{
+std::vector aStrs;
+aStrs.reserve(nDataSize);
+sc::edittext_block::const_iterator it =
sc::edittext_block::begin(*node.data);
+std::advance(it, nOffset);
+sc::edittext_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+for (; it != itEnd; ++it)
+aStrs.push_back(ScEditUtil::GetString(**it));
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/inc sc/source
sc/inc/formularesult.hxx |2 +
sc/source/core/data/formulacell.cxx | 10 ---
sc/source/core/tool/formularesult.cxx | 45 --
3 files changed, 46 insertions(+), 11 deletions(-)
New commits:
commit 097468f0754c49f335d779000861cc181b9a7f24
Author: Kohei Yoshida
Date: Mon Jun 24 21:33:40 2013 -0400
Avoid redundant calls to GetCellResultType().
Change-Id: I105b9f555037b1750af6aaff6fc10d2301afde7c
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 4e6fd39..e215daf 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -134,6 +134,8 @@ public:
one paragraph */
bool IsMultiline() const;
+bool GetErrorOrDouble( sal_uInt16& rErr, double& rVal ) const;
+
/** Get error code if set or GetCellResultType() is formula::svError or
svUnknown,
else 0. */
sal_uInt16 GetResultError() const;
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 01f7488..48af974 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1957,15 +1957,7 @@ bool ScFormulaCell::GetErrorOrValue( sal_uInt16& rErr,
double& rVal )
if (rErr)
return true;
-rErr = aResult.GetResultError();
-if (rErr)
-return true;
-
-if (!aResult.IsValue())
-return false;
-
-rVal = aResult.GetDouble();
-return true;
+return aResult.GetErrorOrDouble(rErr, rVal);
}
bool ScFormulaCell::HasOneReference( ScRange& r ) const
diff --git a/sc/source/core/tool/formularesult.cxx
b/sc/source/core/tool/formularesult.cxx
index e0ca0be..d15a33d 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -249,13 +249,21 @@ bool ScFormulaResult::IsEmptyDisplayedAsString() const
return false;
}
-bool ScFormulaResult::IsValue() const
+namespace {
+
+inline bool isValue( formula::StackVar sv )
{
-formula::StackVar sv = GetCellResultType();
return sv == formula::svDouble || sv == formula::svError
|| sv == formula::svEmptyCell || sv == formula::svHybridValueCell;
}
+}
+
+bool ScFormulaResult::IsValue() const
+{
+return isValue(GetCellResultType());
+}
+
bool ScFormulaResult::IsMultiline() const
{
if (meMultiline == MULTILINE_UNKNOWN)
@@ -269,6 +277,39 @@ bool ScFormulaResult::IsMultiline() const
return meMultiline == MULTILINE_TRUE;
}
+bool ScFormulaResult::GetErrorOrDouble( sal_uInt16& rErr, double& rVal ) const
+{
+if (mnError)
+{
+rErr = mnError;
+return true;
+}
+
+formula::StackVar sv = GetCellResultType();
+if (sv == formula::svError)
+{
+if (GetType() == formula::svMatrixCell)
+{
+// don't need to test for mpToken here, GetType() already did it
+rErr = static_cast(mpToken)->
+GetUpperLeftToken()->GetError();
+}
+else if (mpToken)
+{
+rErr = mpToken->GetError();
+}
+}
+
+if (rErr)
+return true;
+
+if (!isValue(sv))
+return false;
+
+rVal = GetDouble();
+return true;
+}
+
sal_uInt16 ScFormulaResult::GetResultError() const
{
if (mnError)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/formularesult.hxx |2 +
sc/source/core/data/formulacell.cxx | 10 ---
sc/source/core/tool/formularesult.cxx | 45 --
3 files changed, 46 insertions(+), 11 deletions(-)
New commits:
commit 6ff3d0a234635455b9665d9925c609d793ea3185
Author: Kohei Yoshida
Date: Mon Jun 24 21:33:40 2013 -0400
Avoid redundant calls to GetCellResultType().
Change-Id: I105b9f555037b1750af6aaff6fc10d2301afde7c
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index a88f82d..6736a10 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -132,6 +132,8 @@ public:
one paragraph */
bool IsMultiline() const;
+bool GetErrorOrDouble( sal_uInt16& rErr, double& rVal ) const;
+
/** Get error code if set or GetCellResultType() is formula::svError or
svUnknown,
else 0. */
sal_uInt16 GetResultError() const;
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 15652b5..e554df4 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1942,15 +1942,7 @@ bool ScFormulaCell::GetErrorOrValue( sal_uInt16& rErr,
double& rVal )
if (rErr)
return true;
-rErr = aResult.GetResultError();
-if (rErr)
-return true;
-
-if (!aResult.IsValue())
-return false;
-
-rVal = aResult.GetDouble();
-return true;
+return aResult.GetErrorOrDouble(rErr, rVal);
}
bool ScFormulaCell::HasOneReference( ScRange& r ) const
diff --git a/sc/source/core/tool/formularesult.cxx
b/sc/source/core/tool/formularesult.cxx
index a7c70e6..a106e5f 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -249,13 +249,21 @@ bool ScFormulaResult::IsEmptyDisplayedAsString() const
return false;
}
-bool ScFormulaResult::IsValue() const
+namespace {
+
+inline bool isValue( formula::StackVar sv )
{
-formula::StackVar sv = GetCellResultType();
return sv == formula::svDouble || sv == formula::svError
|| sv == formula::svEmptyCell || sv == formula::svHybridValueCell;
}
+}
+
+bool ScFormulaResult::IsValue() const
+{
+return isValue(GetCellResultType());
+}
+
bool ScFormulaResult::IsMultiline() const
{
if (meMultiline == MULTILINE_UNKNOWN)
@@ -269,6 +277,39 @@ bool ScFormulaResult::IsMultiline() const
return meMultiline == MULTILINE_TRUE;
}
+bool ScFormulaResult::GetErrorOrDouble( sal_uInt16& rErr, double& rVal ) const
+{
+if (mnError)
+{
+rErr = mnError;
+return true;
+}
+
+formula::StackVar sv = GetCellResultType();
+if (sv == formula::svError)
+{
+if (GetType() == formula::svMatrixCell)
+{
+// don't need to test for mpToken here, GetType() already did it
+rErr = static_cast(mpToken)->
+GetUpperLeftToken()->GetError();
+}
+else if (mpToken)
+{
+rErr = mpToken->GetError();
+}
+}
+
+if (rErr)
+return true;
+
+if (!isValue(sv))
+return false;
+
+rVal = GetDouble();
+return true;
+}
+
sal_uInt16 ScFormulaResult::GetResultError() const
{
if (mnError)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/inc sc/source
sc/inc/formulacell.hxx |1 +
sc/source/core/data/dociter.cxx |8 +++-
sc/source/core/data/formulacell.cxx | 19 +++
3 files changed, 23 insertions(+), 5 deletions(-)
New commits:
commit ffdb8faf9a7f942ca4c9f74710cc4d07db9981cf
Author: Kohei Yoshida
Date: Mon Jun 24 20:46:37 2013 -0400
Avoid redundant if branches.
Instead of calling GetErrCode(), IsValue() and GetValue() individually,
do it all at once. This alone cuts about 12 seconds off in the calculation
involving a large spreadsheet document.
Conflicts:
sc/inc/formulacell.hxx
Change-Id: Iee94ca9dae00a2c33c0306cdf41bd7832e7ecd03
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 196e6bf..f5fa1c6 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -216,6 +216,7 @@ public:
sal_uLong GetFormatIndex() const { return
nFormatIndex; }
voidGetFormatInfo( short& nType, sal_uLong& nIndex ) const
{ nType = nFormatType; nIndex = nFormatIndex; }
+bool GetErrorOrValue( sal_uInt16& rErr, double& rVal );
sal_uInt8 GetMatrixFlag() const { return
cMatrixFlag; }
ScTokenArray* GetCode() const { return pCode; }
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 1cdc52c..298bb77 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -220,18 +220,16 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16&
rErr)
break;
case sc::element_type_formula:
{
-ScFormulaCell* pCell =
sc::formula_block::at(*maCurPos.first->data, maCurPos.second);
-if (bSubTotal && pCell->IsSubTotal())
+ScFormulaCell& rCell =
*sc::formula_block::at(*maCurPos.first->data, maCurPos.second);
+if (bSubTotal && rCell.IsSubTotal())
{
// Skip subtotal formula cells.
IncPos();
break;
}
-rErr = pCell->GetErrCode();
-if (rErr || pCell->IsValue())
+if (rCell.GetErrorOrValue(rErr, rValue))
{
-rValue = pCell->GetValue();
bNumValid = false;
return true; // Found it!
}
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 3ce95d4..01f7488 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1949,6 +1949,25 @@ sal_uInt16 ScFormulaCell::GetRawError()
return aResult.GetResultError();
}
+bool ScFormulaCell::GetErrorOrValue( sal_uInt16& rErr, double& rVal )
+{
+MaybeInterpret();
+
+rErr = pCode->GetCodeError();
+if (rErr)
+return true;
+
+rErr = aResult.GetResultError();
+if (rErr)
+return true;
+
+if (!aResult.IsValue())
+return false;
+
+rVal = aResult.GetDouble();
+return true;
+}
+
bool ScFormulaCell::HasOneReference( ScRange& r ) const
{
pCode->Reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/formulacell.hxx |1 +
sc/source/core/data/dociter.cxx |8 +++-
sc/source/core/data/formulacell.cxx | 19 +++
3 files changed, 23 insertions(+), 5 deletions(-)
New commits:
commit 3f92f7dc8983b04db104eb0f00aaad5c6810c520
Author: Kohei Yoshida
Date: Mon Jun 24 20:46:37 2013 -0400
Avoid redundant if branches.
Instead of calling GetErrCode(), IsValue() and GetValue() individually,
do it all at once. This alone cuts about 12 seconds off in the calculation
involving a large spreadsheet document.
Change-Id: Iee94ca9dae00a2c33c0306cdf41bd7832e7ecd03
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 1c40939..2ac8412 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -213,6 +213,7 @@ public:
sal_uInt16 GetMatrixEdge( ScAddress& rOrgPos ) const;
sal_uInt16 GetErrCode(); // interpret first if necessary
sal_uInt16 GetRawError(); // don't interpret, just return code or
result error
+bool GetErrorOrValue( sal_uInt16& rErr, double& rVal );
sal_uInt8 GetMatrixFlag() const { return
cMatrixFlag; }
ScTokenArray* GetCode() const { return pCode; }
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 3fa15cf..b5b0e4f 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -220,18 +220,16 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16&
rErr)
break;
case sc::element_type_formula:
{
-ScFormulaCell* pCell =
sc::formula_block::at(*maCurPos.first->data, maCurPos.second);
-if (bSubTotal && pCell->IsSubTotal())
+ScFormulaCell& rCell =
*sc::formula_block::at(*maCurPos.first->data, maCurPos.second);
+if (bSubTotal && rCell.IsSubTotal())
{
// Skip subtotal formula cells.
IncPos();
break;
}
-rErr = pCell->GetErrCode();
-if (rErr || pCell->IsValue())
+if (rCell.GetErrorOrValue(rErr, rValue))
{
-rValue = pCell->GetValue();
bNumValid = false;
return true; // Found it!
}
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 68d242d..15652b5 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1934,6 +1934,25 @@ sal_uInt16 ScFormulaCell::GetRawError()
return aResult.GetResultError();
}
+bool ScFormulaCell::GetErrorOrValue( sal_uInt16& rErr, double& rVal )
+{
+MaybeInterpret();
+
+rErr = pCode->GetCodeError();
+if (rErr)
+return true;
+
+rErr = aResult.GetResultError();
+if (rErr)
+return true;
+
+if (!aResult.IsValue())
+return false;
+
+rVal = aResult.GetDouble();
+return true;
+}
+
bool ScFormulaCell::HasOneReference( ScRange& r ) const
{
pCode->Reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO 4.0.4 release for OSX not signed
I wrote: > Yep, seems to have slipped through - on it, thanks for bringing it up > here. > Newly-packed and signed binaries: http://dev-builds.libreoffice.org/pre-releases/LibreOffice_4.0.4.2_MacOS_x86.dmg , will replace at the official download site as we speak. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: introducing feature/instdir - "installing" change (not finished)
On Mon, Jun 24, 2013 at 5:12 PM, Matúš Kukan wrote: > open questions: > - How does this impact tinderboxes / What install-tb: should do install-tb is a ugly hack. if after a simple make smoketest (and other test teh require a full install) can run, all the better and good ridance to install-tb > - What's MACOSX_CODESIGNING_IDENTITY thing in dev-install target - > should we move it to instsetoo_native/ as a custom target probably ? That is to trigger code signing. for most dev that is pointless and is only critical for official release-build > > Ideally, someone (more people) now step in and finish the work ;-) No promise... but I will at least try to test build things on Mac... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
introducing feature/instdir - "installing" change (not finished)
Hi there, Thanks to David's work on instdir and filelists (Julien was helping out and probably also others, thanks!) we now produce instdir/ directory during build which is almost the same as install/ after make dev-install. So, when feature/instdir is merged, there should be no need to run make dev-install - if you are a simple developer who just wants to run soffice. Could someone please test feature/instdir for other platforms, possibly also for Linux ? It most probably does work only on Linux now, but should be easy to fix - only few variables I suspect. Well, smoketest's extension test fails also for me unfortunately :-( Ideally what you would check: - install/ produced in 5722cc4b075397f312ad9366539b73bc310bfd34~ and in 87bea8266ca1e3877ad961555b33d99b1317f63c is the ~same - diff -rq install instdir/*/ does not show differing files, only some (not important) missing ones open questions: - How does this impact tinderboxes / What install-tb: should do - What's MACOSX_CODESIGNING_IDENTITY thing in dev-install target - should we move it to instsetoo_native/ as a custom target probably ? Ideally, someone (more people) now step in and finish the work ;-) Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Replace more characters functions with rtl/character.hxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4447 Approvals: LibreOffice gerrit bot: Verified Michael Stahl: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4447 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70f3c31e4b2f44d2b30020a588aaa53d3b63d452 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Drop help for removed Embed standard fonts option
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4496 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/96/4496/1 Drop help for removed Embed standard fonts option Change-Id: Iddb13afd25483de4753e315b5524fa6cca8b5f93 --- M source/text/shared/01/ref_pdf_export.xhp 1 file changed, 0 insertions(+), 3 deletions(-) diff --git a/source/text/shared/01/ref_pdf_export.xhp b/source/text/shared/01/ref_pdf_export.xhp index 72c3028..424862e 100644 --- a/source/text/shared/01/ref_pdf_export.xhp +++ b/source/text/shared/01/ref_pdf_export.xhp @@ -121,9 +121,6 @@ Export automatically inserted blank pages If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not. - -Embed standard fonts -Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document. Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software. Initial View tab Panes -- To view, visit https://gerrit.libreoffice.org/4496 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddb13afd25483de4753e315b5524fa6cca8b5f93 Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Khaled Hosny ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/unotools sc/source
include/unotools/charclass.hxx |8
sc/source/core/tool/compiler.cxx |8
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 337225b36a2965cca532c73f02e9313149f73d80
Author: Arnaud Versini
Date: Sat Jun 22 14:51:36 2013 +0200
Replace more characters functions with rtl/character.hxx
Change-Id: I70f3c31e4b2f44d2b30020a588aaa53d3b63d452
Reviewed-on: https://gerrit.libreoffice.org/4447
Tested-by: LibreOffice gerrit bot
Reviewed-by: Michael Stahl
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 6ea11f6..3ff8345 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -21,7 +21,6 @@
#ifndef _UNOTOOLS_CHARCLASS_HXX
#define _UNOTOOLS_CHARCLASS_HXX
-#include // isdigit(), isalpha()
#include
#include
#include
@@ -32,6 +31,7 @@
#include
#include
#include
+#include
class String;
namespace com { namespace sun { namespace star {
@@ -95,19 +95,19 @@ public:
/// isdigit() on ascii values
static inline sal_Bool isAsciiDigit( sal_Unicode c )
{
-return c < 128 ? sal_Bool(isdigit( (unsigned char) c ) != 0) :
sal_False;
+return rtl::isAsciiDigit( c );
}
/// isalpha() on ascii values
static inline sal_Bool isAsciiAlpha( sal_Unicode c )
{
-return c < 128 ? sal_Bool(isalpha( (unsigned char) c ) != 0) :
sal_False;
+return rtl::isAsciiAlpha( c );
}
/// isalnum() on ascii values
static inline sal_Bool isAsciiAlphaNumeric( sal_Unicode c )
{
-return c < 128 ? sal_Bool(isalnum( (unsigned char) c ) != 0) :
sal_False;
+return rtl::isAsciiAlphanumeric( c );
}
/// isdigit() on ascii values of entire string
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index afd50e1..d0ef4ad 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -570,7 +570,7 @@ static bool lcl_parseExternalName(
{
do
{
-if (CharClass::isAsciiAlphaNumeric(c))
+if (rtl::isAsciiAlphanumeric(c))
// allowed.
break;
@@ -2156,7 +2156,7 @@ Label_MaskStateMachine:
}
}
else if ((nMask & SC_COMPILER_C_WORD_SEP) ||
-(c < 128 && !CharClass::isAsciiAlphaNumeric( c)))
+(c < 128 && !rtl::isAsciiAlphanumeric( c)))
{
bAdd = false;
eState = ssStop;
@@ -2781,7 +2781,7 @@ bool ScCompiler::IsReference( const String& rName )
if ( ch1 == cDecSep )
return false;
// Who was that imbecile introducing '.' as the sheet name separator!?!
-if ( CharClass::isAsciiNumeric( OUString(ch1) ) )
+if ( rtl::isAsciiDigit( ch1 ) )
{
// Numerical sheet name is valid.
// But English 1.E2 or 1.E+2 is value 100, 1.E-2 is 0.01
@@ -2798,7 +2798,7 @@ bool ScCompiler::IsReference( const String& rName )
}
sal_Unicode const * const pTabSep = rName.GetBuffer() + nPos;
sal_Unicode ch2 = pTabSep[1]; // maybe a column identifier
-if ( !(ch2 == '$' || CharClass::isAsciiAlpha( ch2 )) )
+if ( !(ch2 == '$' || rtl::isAsciiAlpha( ch2 )) )
return false;
if ( cDecSep == '.' && (ch2 == 'E' || ch2 == 'e') // E + - digit
&& (GetCharTableFlags( pTabSep[2], pTabSep[1] ) &
SC_COMPILER_C_VALUE_EXP) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - connectivity/source sal/inc
connectivity/source/commontools/TTableHelper.cxx | 11 +--
sal/inc/sal/log-areas.dox|1 +
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 8a6df1a62ded3b6da47022a5b7eec2ba6e81112c
Author: Lionel Elie Mamane
Date: Fri Jun 21 15:24:15 2013 +0200
fdo#49708 when there is no Primary Key, there is no Primay Key
As opposed to a primary key with empty name and no columns (!)
Change-Id: I78ca185947a0e8d37bac64bd50add155afaeed47
Reviewed-on: https://gerrit.libreoffice.org/4432
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index 6a5ad87..863938e 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -339,12 +339,19 @@ void OTableHelper::refreshPrimaryKeys(TStringVector&
_rNames)
if ( !bAlreadyFetched )
{
aPkName = xRow->getString(6);
+SAL_WARN_IF(xRow->wasNull(),"connectivity.commontools", "NULL
Primary Key name");
+SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools",
"empty Primary Key name");
bAlreadyFetched = true;
}
}
-m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
-_rNames.push_back(aPkName);
+if(bAlreadyFetched)
+{
+SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools", "empty
Primary Key name");
+SAL_WARN_IF(pKeyProps->m_aKeyColumnNames.size() ==
0,"connectivity.commontools", "Primary Key has no columns");
+m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
+_rNames.push_back(aPkName);
+}
} // if ( xResult.is() && xResult->next() )
::comphelper::disposeComponent(xResult);
}
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index d943703..12cc4c7 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -36,6 +36,7 @@ certain functionality.
@section connectivity
+@li @c connectivity.commontools
@li @c connectivity.mork
@li @c connectivity.parse
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source framework/source i18npool/source
accessibility/source/extended/accessibleeditbrowseboxcell.cxx |2
framework/source/fwe/helper/titlehelper.cxx |2
framework/source/recording/dispatchrecorder.cxx |2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |8
+--
i18npool/source/localedata/LocaleNode.cxx | 26
+-
5 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 126827b0fdc2277d728d57d4fe68b446fa2f7a08
Author: Jelle van der Waa
Date: Sat Jun 22 12:53:04 2013 +0200
fdo#43460 framework,i18npool,accessibility: use isEmpty()
Change-Id: I4cd9841127b1d4a294d7f001b646259c61eb1172
Reviewed-on: https://gerrit.libreoffice.org/4443
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index bcaec36..3c601c6 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -120,7 +120,7 @@ namespace accessibility
// TODO: localize this!
OUStringBuffer sName(mpBrowseBox->GetColumnDescription(
::sal::static_int_cast< sal_uInt16 >( getColumnPos() ) ));
-if ( 0 == sName.getLength() )
+if ( sName.isEmpty() )
{
sName.appendAscii("Column ");
sName.append(getColumnPos());
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 07bf13d..dd301e6 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -521,7 +521,7 @@ void TitleHelper::impl_appendProductName (OUStringBuffer&
sTitle)
OUString name(utl::ConfigManager::getProductName());
if (!name.isEmpty())
{
-if (sTitle.getLength() != 0)
+if (!sTitle.isEmpty())
sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
sTitle.append(name);
}
diff --git a/framework/source/recording/dispatchrecorder.cxx
b/framework/source/recording/dispatchrecorder.cxx
index 708b4cd..a504077 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -356,7 +356,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const
OUString& aURL,
{
sValBuffer.setLength(0);
}
-if (!sValBuffer.getLength())
+if (sValBuffer.isEmpty())
continue;
{
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 4e962c8..d8b85cc 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -411,7 +411,7 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString&
rsResult )
if ((nDigit = nPart % 100) < 20)
{
-if (aTemp.getLength())
+if (!aTemp.isEmpty())
aTemp.insert( 0, sal_Unicode(0x0020));
aTemp.insert( 0, table_PersianWord_decade1[nDigit]);
}
@@ -419,13 +419,13 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString&
rsResult )
{
if ((nDigit = nPart % 10) != 0)
{
-if (aTemp.getLength())
+if (!aTemp.isEmpty())
aTemp.insert( 0, asPersianWord_conjunction);
aTemp.insert( 0, table_PersianWord_decade1[nDigit]);
}
if ((nDigit = (nPart / 10) % 10) != 0)
{
-if (aTemp.getLength())
+if (!aTemp.isEmpty())
aTemp.insert( 0, asPersianWord_conjunction);
aTemp.insert( 0, table_PersianWord_decade2[nDigit-2]);
}
@@ -433,7 +433,7 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString&
rsResult )
if ((nDigit = nPart / 100) != 0)
{
-if (aTemp.getLength())
+if (!aTemp.isEmpty())
aTemp.insert( 0, asPersianWord_conjunction);
aTemp.insert( 0, table_PersianWord_decade3[nDigit-1]);
}
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index fc21134..35c7ff4 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1022,7 +1022,7 @@ void LCFormatNode::generateCode (const OFileWriter &of)
const
if (!(nDetected & 4))
{
aPatternBuf.append( 'Y');
-if (aPatternBuf2.getLength() > 0)
+if (!aPatternBuf2.isEmpty())
aPatternBuf2.append( 'Y');
nDetected |= 4;
[Libreoffice-commits] core.git: rsc/source sdext/source sd/source ucb/source
rsc/source/rsc/rsc.cxx |4 ++--
sd/source/filter/ppt/pptinanimations.cxx |2 +-
sdext/source/pdfimport/tree/drawtreevisiting.cxx |6 +++---
sdext/source/pdfimport/tree/writertreevisiting.cxx | 10 +-
sdext/source/pdfimport/wrapper/wrapper.cxx |2 +-
ucb/source/ucp/ftp/ftpurl.cxx |2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 51daa4de4fbb86903aeb9cdfefbb089e8d00c001
Author: Jelle van der Waa
Date: Sat Jun 22 12:52:31 2013 +0200
fdo#43460 sd,rsc,ucb,sdext: use isEmpty()
Change-Id: I7a7a77c26b74078f7fc160fbaa1c8d4e912b844e
Reviewed-on: https://gerrit.libreoffice.org/4442
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 0ef48b6..aa7a54a 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -155,7 +155,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError *
pEH )
{ // define include path
nCommands |= INCLUDE_FLAG;
OStringBuffer aBuffer(aPath);
-if (aBuffer.getLength())
+if (!aBuffer.isEmpty())
aBuffer.append(SAL_PATHSEPARATOR);
aBuffer.append((*ppStr) + 2);
aPath = aBuffer.makeStringAndClear();
@@ -636,7 +636,7 @@ ERRTYPE RscCompiler::Link()
do
{
OString aToken = aSearchPath.getToken( 0, cSearchDelim, nIndex
);
-if (aSysSearchPath.getLength())
+if (!aSysSearchPath.isEmpty())
aSysSearchPath.append(cSearchDelim);
aSysSearchPath.append(aToken);
aSysSearchPath.append(cAccessDelim);
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index 75b426d..a59b7cb 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2555,7 +2555,7 @@ bool AnimationImporter::importAttributeNamesContainer(
const Atom* pAtom, OUStri
OUString aName;
if( aAny >>= aName )
{
-if( aNames.getLength() )
+if( !aNames.isEmpty() )
aNames.append( (sal_Unicode)';' );
aNames.append( aName );
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 5144015..e4f1d66 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -91,7 +91,7 @@ void DrawXmlEmitter::visit( HyperlinkElement& elem, const
std::list< Element* >:
void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element*
>::const_iterator& )
{
-if( ! elem.Text.getLength() )
+if( elem.Text.isEmpty() )
return;
OUString strSpace(32);
@@ -229,14 +229,14 @@ void DrawXmlEmitter::fillFrameProps( DrawElement&
rElem,
}
if( fRotate != 0.0 )
{
-if( aBuf.getLength() > 0 )
+if( !aBuf.isEmpty() )
aBuf.append( sal_Unicode(' ') );
aBuf.appendAscii( "rotate( " );
aBuf.append( -fRotate );
aBuf.appendAscii( " )" );
}
-if( aBuf.getLength() > 0 )
+if( !aBuf.isEmpty() )
aBuf.append( sal_Unicode(' ') );
aBuf.appendAscii( "translate( " );
aBuf.append( convertPixelToUnitString( rel_x ) );
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx
b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index dcb863e..b36a39b 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -58,7 +58,7 @@ void WriterXmlEmitter::visit( HyperlinkElement& elem, const
std::list< Element*
void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element*
>::const_iterator& )
{
-if( ! elem.Text.getLength() )
+if( elem.Text.isEmpty() )
return;
PropertyMap aProps;
@@ -169,7 +169,7 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&
rElem,
}
if( fRotate != 0.0 )
{
-if( aBuf.getLength() > 0 )
+if( !aBuf.isEmpty() )
aBuf.append( sal_Unicode(' ') );
aBuf.appendAscii( "rotate( " );
aBuf.append( -fRotate );
@@ -178,7 +178,7 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&
rElem,
}
if( ! rElem.isCharacter )
{
-if( aBuf.getLength() > 0 )
+if( !aBuf.isEmpty() )
aBuf.append( sal_Unicode(' ') );
aBuf.appendAscii( "translate( " );
aBuf.append( convertPixelToUnitString( rel_x ) );
@@ -750,9 +750,9 @@ void WriterXmlOptimizer::optimizeTextElements(Element&
rParent)
Re: LO 4.0.4 release for OSX not signed
Alexander Thurgood wrote: > Apparently, the LO 4.0.4 production release is not signed, is this an > oversight ? After LO 4.0.3, people on OSX 10.8 are having problems > installing again. > Yep, seems to have slipped through - on it, thanks for bringing it up here. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/instdir'
New branch 'feature/instdir' available with the following commits: commit 87bea8266ca1e3877ad961555b33d99b1317f63c Author: Matúš Kukan Date: Wed Jun 19 14:50:02 2013 +0200 start to use instdir for subsequentcheck tests; avoid make dev-install This commit breaks linkoo. make dev-install continues to work as before but it's not necessary to use it anymore. make check now uses files copied into instdir by gbuild. TODO: fix remaining issues so that instdir is the same as install/. Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98 commit 55fe99302beb1bf9d9260672617adffafc3161f1 Author: Matúš Kukan Date: Fri Jun 21 22:29:38 2013 +0200 properly generate rc files Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad commit 9ce299fc2488f77ad44e3d6c97254c45fe39b6b5 Author: Matúš Kukan Date: Tue Jun 18 23:34:59 2013 +0200 gbuild: avoid packages when copying files into instdir There should be only two ways how to add file into instdir: - gb_Helper_install used in gbuild - gb_Package_set_outdir used also elsewhere, preferably with scp2 containing its .filelist. Change-Id: I75ec0ba63f32acf4b56b17dc972f4488edf6a777 commit af9c5d61215c467c779d3f0d20ba0328e0101765 Author: Matúš Kukan Date: Wed Jun 19 13:52:44 2013 +0200 gbuild: install rdb files directly in module they come from Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26 commit ba0aba06c383a1e7d38694981871e5e05dbf023a Author: Matúš Kukan Date: Wed Jun 19 11:50:43 2013 +0200 scp2: a little cleaning Change-Id: I4b41f8c2c6dd82956cb2493676c9854744eecbad commit 5e581cde248796f8f239881220af13f7a759f492 Author: Matúš Kukan Date: Tue Jun 18 20:42:24 2013 +0200 install soffice script into instdir Change-Id: Id55fc6efcd957de926df79ca02200f4fda7c56b0 commit a87ff49439b424de478694d0ca5025de36efe2b8 Author: Matúš Kukan Date: Tue Jun 18 19:31:49 2013 +0200 replace variables in main.xcd already in gbuild In main.xcd we have some variables which used to be defined mostly in instsetoo_native/util/openoffice.lst and replaced in installer. Process the file in custom target, so we can copy correct main.xcd directly with gbuild. Change-Id: Ie2b1b6da1adb161394f69c345bbe8671cfafb7c4 commit 08c2d4956f0efd82205a8b2e6df0b72605d108f1 Author: Matúš Kukan Date: Tue Jun 18 16:14:18 2013 +0200 pyuno: another filelist to make instdir better Change-Id: Ieda9b3847de3de8989eaafc542e60216baa1af4d commit a37957444fe6b3d1733894fdaf6fc24425c909c7 Author: Matúš Kukan Date: Tue Jun 18 16:08:14 2013 +0200 pyuno: this rc file seems to be unused Change-Id: I98b6263a464b46075e69e363c3eb9e4ec4557c46 commit c11fd007609c4647949d55f14c859b95fd20e465 Author: Matúš Kukan Date: Tue Jun 18 11:14:23 2013 +0200 install whole sdk using filelists Change-Id: I9d8d0a20d776740c4701ec9a1facded9f4bde77a commit 95b22eee734a4c9eebe8493ac4111379e8db96df Author: Matúš Kukan Date: Mon Jun 17 17:24:41 2013 +0200 ure: install files with filelists This commit adds gb_Package_add_symbolic_link. Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5 commit 211dc62e28c45be4752e63a85b31acca570d6566 Author: Matúš Kukan Date: Mon Jun 17 16:37:01 2013 +0200 jvmfwk: install also into instdir Change-Id: I4004361a85af4e6aed9dd0951d1154a2d99f97e7 commit 430337e5ef6da1447d1258a684994c35dd9c0521 Author: Matúš Kukan Date: Mon Jun 17 15:41:34 2013 +0200 install images with filelists Change-Id: I3946b44838c659cad12d288c8a1ed5137c3e554e commit 5722cc4b075397f312ad9366539b73bc310bfd34 Author: Matúš Kukan Date: Mon Jun 17 15:26:52 2013 +0200 pyuno: install python scripts using filelists Change-Id: Ic7515acd14916cc36b59749059ed623cda906c23 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/inc sc/source
sc/inc/dbdataformatting.hxx |7 ++-
sc/source/core/tool/dbdataformatting.cxx | 18 +-
2 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit f502c0ea6826fc0e915d8d4c302fe978a4d43a58
Author: Akash Shetye
Date: Tue Jun 25 02:58:57 2013 +0530
Add the support for Table Style Name in ScDBDataFormatting.
Also make the class publicly accessible using SC_DLLPUBLIC.
Change-Id: Icdf49007b77368ba5dbb2cab1d8ef56fdda211d7
diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
index aa3bd65..ef8d5fd 100644
--- a/sc/inc/dbdataformatting.hxx
+++ b/sc/inc/dbdataformatting.hxx
@@ -20,9 +20,11 @@
#define SC_DBDATAFORMATTING_HXX
#include "rtl/ustring.hxx"
+#include "scdllapi.h"
-class ScDBDataFormatting
+class SC_DLLPUBLIC ScDBDataFormatting
{
+OUString maTableStyleName;
OUString maFirstRowStripeStyle;
OUString maSecondRowStripeStyle;
OUString maFirstColStripeStyle;
@@ -30,8 +32,11 @@ class ScDBDataFormatting
bool bBandedRows;
bool bBandedColumns;
public:
+ScDBDataFormatting();
ScDBDataFormatting(const OUString& rFirstRowStripeStyle, const
OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const
OUString& rSecondColStripeStyle, bool bBRows, bool bBCols);
ScDBDataFormatting( const ScDBDataFormatting& rTableFormatData );
+void SetTableStyleName( const OUString& rTableStyleName );
+const OUString& GetTableStyleName();
void SetBandedRows( bool bBRows );
bool GetBandedRows();
void SetBandedColumns( bool bBCols );
diff --git a/sc/source/core/tool/dbdataformatting.cxx
b/sc/source/core/tool/dbdataformatting.cxx
index c398883..fe6a8a2 100644
--- a/sc/source/core/tool/dbdataformatting.cxx
+++ b/sc/source/core/tool/dbdataformatting.cxx
@@ -20,7 +20,12 @@
#include "dbdataformatting.hxx"
#include "rtl/ustring.hxx"
-ScDBDataFormatting::ScDBDataFormatting(const OUString& rFirstRowStripeStyle,
const OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle,
const OUString& rSecondColStripeStyle, bool bBRows, bool bBCols) :
+ScDBDataFormatting::ScDBDataFormatting()
+{
+}
+
+ScDBDataFormatting::ScDBDataFormatting(const OUString& rTableStyleName, const
OUString& rFirstRowStripeStyle, const OUString& rSecondRowStripeStyle, const
OUString& rFirstColStripeStyle, const OUString& rSecondColStripeStyle, bool
bBRows, bool bBCols) :
+maTableStyleName( rTableStyleName ),
maFirstRowStripeStyle ( rFirstRowStripeStyle),
maSecondRowStripeStyle ( rSecondRowStripeStyle ),
maFirstColStripeStyle ( rFirstColStripeStyle ),
@@ -31,6 +36,7 @@ ScDBDataFormatting::ScDBDataFormatting(const OUString&
rFirstRowStripeStyle, con
}
ScDBDataFormatting::ScDBDataFormatting( const ScDBDataFormatting&
rTableFormatData ):
+maTableStyleName( rTableFormatData.maTableStyleName ),
maFirstRowStripeStyle ( rTableFormatData.maFirstRowStripeStyle ),
maSecondRowStripeStyle ( rTableFormatData.maSecondRowStripeStyle ),
maFirstColStripeStyle ( rTableFormatData.maFirstColStripeStyle ),
@@ -40,6 +46,16 @@ ScDBDataFormatting::ScDBDataFormatting( const
ScDBDataFormatting& rTableFormatDa
{
}
+void ScDBDataFormatting::SetTableStyleName( const OUString& rTableStyleName )
+{
+maTableStyleName = rTableStyleName;
+}
+
+const OUString& ScDBDataFormatting::GetTableStyleName()
+{
+return maTbleStyleName;
+}
+
void ScDBDataFormatting::SetBandedRows( bool bBRows )
{
bBandedRows = bBRows;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlccommon.hxx |2
avmedia/source/vlc/vlcmanager.cxx |2
avmedia/source/vlc/vlcplayer.cxx | 19
avmedia/source/vlc/vlcplayer.hxx |9 +++-
avmedia/source/vlc/vlcwindow.cpp | 82 +-
avmedia/source/vlc/vlcwindow.hxx | 22 ++
6 files changed, 130 insertions(+), 6 deletions(-)
New commits:
commit 9fef11b4527fd5156522c4fd5beae54274ef64a7
Author: Minh Ngo
Date: Tue Jun 25 00:06:34 2013 +0300
Fixing source for building
Change-Id: I0470684c8e2f043e891a58e11f498706c9a7a7f6
diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index 62551d0..e9cc864 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -19,8 +19,6 @@
#ifndef _VLCCOMMON_HXX
#define _VLCCOMMON_HXX
-//TODO: Remove it before committing
-#define SAL_CALL
#include
diff --git a/avmedia/source/vlc/vlcmanager.cxx
b/avmedia/source/vlc/vlcmanager.cxx
index 5286eb6..18681de 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -20,7 +20,7 @@ Manager::~Manager()
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const
rtl::OUString& rURL )
throw (uno::RuntimeException)
{
-VLCPlayer* pPlayer( new VLCPlayer( mxMgr ) );
+VLCPlayer* pPlayer( new VLCPlayer( /* mxMgr */ ) );
uno::Reference< media::XPlayer > xRet( pPlayer );
return xRet;
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 24375ad..647ec67 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -15,7 +15,8 @@ const char * const VLC_ARGS[] = {
};
VLCPlayer::VLCPlayer()
-: mInstance( libvlc_new( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ),
VLC_ARGS ), libvlc_release )
+: VLC_Base(m_aMutex)
+, mInstance( libvlc_new( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ),
VLC_ARGS ), libvlc_release )
, mPlayer( libvlc_media_player_new(mInstance.get()),
libvlc_media_player_release )
{
}
@@ -106,12 +107,28 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL
VLCPlayer::createPlayerWind
::osl::MutexGuard aGuard(m_aMutex);
return uno::Reference< css::media::XPlayerWindow >(new VLCWindow());
}
+
uno::Reference< css::media::XFrameGrabber > SAL_CALL
VLCPlayer::createFrameGrabber()
{
::osl::MutexGuard aGuard(m_aMutex);
return uno::Reference< css::media::XFrameGrabber >();
}
+::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
+{
+return ::rtl::OUString();
+}
+
+::sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString&
ServiceName )
+{
+return false;
+}
+
+::uno::Sequence< ::rtl::OUString > SAL_CALL
VLCPlayer::getSupportedServiceNames()
+{
+return ::uno::Sequence< ::rtl::OUString >();
+}
+
}
}
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index ee1ebba..da1673a 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -20,10 +20,13 @@
#ifndef _VLCPLAYER_HXX
#define _VLCPLAYER_HXX
+#include "vlccommon.hxx"
#include
+#include
+#include
#include
#include
-#include "vlccommon.hxx"
+
namespace avmedia {
namespace vlc {
@@ -55,6 +58,10 @@ public:
css::awt::Size SAL_CALL getPreferredPlayerWindowSize();
::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL
createPlayerWindow( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& aArguments );
::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL
createFrameGrabber();
+
+::rtl::OUString SAL_CALL getImplementationName();
+::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName );
+::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames();
};
}
diff --git a/avmedia/source/vlc/vlcwindow.cpp b/avmedia/source/vlc/vlcwindow.cpp
index 77656eb..c92dd7a 100644
--- a/avmedia/source/vlc/vlcwindow.cpp
+++ b/avmedia/source/vlc/vlcwindow.cpp
@@ -1,6 +1,6 @@
#include "vlcwindow.hxx"
-using namespace ::com::sun::star;
+using namespace ;
namespace avmedia {
namespace vlc {
@@ -38,5 +38,85 @@ void SAL_CALL VLCWindow::setPointerType( ::sal_Int32
SystemPointerType )
return ::uno::Sequence< ::rtl::OUString >();
}
+void SAL_CALL VLCWindow::dispose() throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addEventListener( const ::uno::Reference<
::lang::XEventListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removeEventListener( const ::uno::Reference<
:::lang::XEventListener >& aListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32
Width, sal_Int32 Height, sal_Int16 Flags ) throw (::uno::RuntimeException)
+{
+}
+
+::awt::Rectangle SAL_CALL VLCWindow::getPosSize() throw
(::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::setVisible( sal_
First part of Calc core refactoring is in
The first part of my Calc core refactoring change is now on master. You guys can now push to sc freely. Thanks a lot for your help. I will continue to make changes to the core even after this merge, but I think the rate of change will be smaller and more focused that I can handle it in parallel with other changes. Kohei -- Kohei Yoshida, LibreOffice Calc hacker, SUSE. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa sd/inc sd/source
sc/qa/unit/subsequent_filters-test.cxx |6 +--
sd/inc/drawdoc.hxx |1
sd/inc/shapelist.hxx | 21 +
sd/source/core/drawdoc.cxx | 11 +++---
sd/source/core/drawdoc4.cxx | 10 --
sd/source/core/sdpage.cxx| 39 +++-
sd/source/core/sdpage2.cxx |6 +--
sd/source/core/shapelist.cxx | 49 ++-
sd/source/ui/view/drviews1.cxx |7 ++--
sd/source/ui/view/sdview5.cxx|5 +--
sd/source/ui/view/viewoverlaymanager.cxx |5 +--
11 files changed, 73 insertions(+), 87 deletions(-)
New commits:
commit ee51444ed1f7003dafc93c8181b5f8c1b0fd165b
Author: Noel Power
Date: Mon Jun 24 21:40:32 2013 +0100
fix borders unit test ( test values have changed )
Change-Id: I1205eddf83781bef655abe4a1293c691bc5f1c41
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 17bfc32..f4aa9ec 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -766,19 +766,19 @@ void ScFiltersTest::testBorderXLS()
CPPUNIT_ASSERT(pRight);
CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(),
table::BorderLineStyle::SOLID);
-CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),4L);
+CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),1L);
pDoc->GetBorderLines( 3, 5, 0, &pLeft, &pTop, &pRight, &pBottom );
CPPUNIT_ASSERT(pRight);
CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(),
table::BorderLineStyle::SOLID);
-CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),12L);
+CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),20L);
pDoc->GetBorderLines( 5, 7, 0, &pLeft, &pTop, &pRight, &pBottom );
CPPUNIT_ASSERT(pRight);
CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(),
table::BorderLineStyle::SOLID);
-CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),16L);
+CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),30L);
}
struct Border
{
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 77ac6b6..1d05eb3 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -145,6 +145,7 @@ private:
Timer* mpWorkStartupTimer;
Timer* mpOnlineSpellingTimer;
sd::ShapeList* mpOnlineSpellingList;
+sd::ShapeList::const_iterator maShapeListIterator;
SvxSearchItem* mpOnlineSearchItem;
std::vector maFrameViewList;
SdCustomShowList* mpCustomShowList;
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index f828ebc6..2d759a2 100644
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -29,6 +29,10 @@ namespace sd
class ShapeList : public sdr::ObjectUser
{
public:
+/** const_iterator guarantee only that the list itself is not
+ altered. The objects referenced by the list are still mutable. */
+typedef std::list< SdrObject* >::const_iterator const_iterator;
+
ShapeList();
virtual ~ShapeList();
@@ -48,26 +52,17 @@ namespace sd
/** @return true if given shape is part of this list */
bool hasShape( SdrObject& rObject ) const;
-/** returns the shape the internal iterator points to, or 0 if
- * the list end is reached. moves the internal iterator to the
- * next shape. */
-SdrObject* getNextShape();
-
-/** Sets the internal iterator to the shape at given index. */
-void seekShape( sal_uInt32 nIndex );
-
-/**
-*/
-bool hasMore() const;
+/** @return const_iterator pointing to the first element */
+const_iterator cbegin() const;
-const std::list< SdrObject* >& getList() const { return maShapeList; }
+/** @return const_iterator pointing to the list termination element */
+const_iterator cend() const;
private:
virtual void ObjectInDestruction(const SdrObject& rObject);
typedef std::list< SdrObject* > ListImpl;
ListImpl maShapeList;
-ListImpl::iterator maIter;
};
}
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index aca4996..ed8d1fc 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -144,6 +144,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
, mpWorkStartupTimer(NULL)
, mpOnlineSpellingTimer(NULL)
, mpOnlineSpellingList(NULL)
+, maShapeListIterator()
, mpOnlineSearchItem(NULL)
, mpCustomShowList(NULL)
, mpDocSh(static_cast< ::sd::DrawDocShell*>(pDrDocSh))
@@ -694,7 +695,7 @@ void SdDrawDocument::UpdateAllLinks()
*/
void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool*
pSPool )
{
-sd::ShapeList& rPresentationShapes( pPage->GetPresentationShapeList() );
+const sd::ShapeList& rPresentationShapes(
pPage->GetPresentationShapeList() );
if(!rPresentationShapes.isEmpty())
{
// Cre
[Libreoffice-commits] core.git: include/oox sc/source
include/oox/helper/helper.hxx |1 +
sc/source/filter/excel/xestyle.cxx|5 +++--
sc/source/filter/excel/xistyle.cxx|2 +-
sc/source/filter/inc/xlconst.hxx |6 +++---
sc/source/filter/oox/stylesbuffer.cxx |2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 1680a8cd4f4393ec15c4f85cb63b6654117d56d1
Author: Noel Power
Date: Mon Jun 24 21:04:51 2013 +0100
fix hair & fine cell border export ( followon fix fdo#56960 )
1) align excel binary and oox import filter border thickness values
2) use new fine-dash border style
3) detect & determine hair vrs fine borderline on export
Change-Id: Ieb024bc6f4bfc87c525082c7b9a1f3c444f5c5ca
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 4f8e738..1b85ac3 100644
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -88,6 +88,7 @@ const sal_Int32 API_RGB_WHITE = 0xFF; ///<
White color for AP
const sal_Int16 API_LINE_SOLID = 0;
const sal_Int16 API_LINE_DOTTED = 1;
const sal_Int16 API_LINE_DASHED = 2;
+const sal_Int16 API_FINE_LINE_DASHED= 14;
const sal_Int16 API_LINE_NONE = 0;
const sal_Int16 API_LINE_HAIR = 2;
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 0623ae5..c3ab137 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1575,12 +1575,13 @@ void lclGetBorderLine(
case table::BorderLineStyle::DOTTED:
rnXclLine = EXC_LINE_DOTTED;
break;
+case table::BorderLineStyle::FINE_DASHED:
+rnXclLine = EXC_LINE_HAIR;
+break;
default:
break;
}
}
-else if( nOuterWidth >= EXC_BORDER_HAIR )
-rnXclLine = EXC_LINE_HAIR;
else
rnXclLine = EXC_LINE_NONE;
}
diff --git a/sc/source/filter/excel/xistyle.cxx
b/sc/source/filter/excel/xistyle.cxx
index 8158652..a22ef9b 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -904,7 +904,7 @@ bool lclConvertBorderLine( ::editeng::SvxBorderLine& rLine,
const XclImpPalette&
{ EXC_BORDER_THIN,table::BorderLineStyle::DOTTED }, // 4 = dotted
{ EXC_BORDER_THICK, table::BorderLineStyle::SOLID }, // 5 = thick
{ EXC_BORDER_THIN,table::BorderLineStyle::DOUBLE }, // 6 = double
-{ EXC_BORDER_HAIR,table::BorderLineStyle::SOLID }, // 7 = hair
+{ EXC_BORDER_HAIR,table::BorderLineStyle::FINE_DASHED }, // 7 =
hair
{ EXC_BORDER_MEDIUM, table::BorderLineStyle::DASHED }, // 8 = med
dash
{ EXC_BORDER_THIN,table::BorderLineStyle::SOLID }, // 9 = thin
dashdot
{ EXC_BORDER_MEDIUM, table::BorderLineStyle::SOLID }, // A = med
dashdot
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index f8ccaec..fc7a662 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -254,9 +254,9 @@ const sal_uInt16 EXC_FUTUREREC_ALERT= 0x0002;
// TODO: These values are approximate; we should probably tweak these values
// further to better match Excel's border thickness.
-const sal_uInt16 EXC_BORDER_THICK = 16;
-const sal_uInt16 EXC_BORDER_MEDIUM = 12;
-const sal_uInt16 EXC_BORDER_THIN = 4;
+const sal_uInt16 EXC_BORDER_THICK = 30;
+const sal_uInt16 EXC_BORDER_MEDIUM = 20;
+const sal_uInt16 EXC_BORDER_THIN = 1;
const sal_uInt16 EXC_BORDER_HAIR = 1;
//
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index e06f075..e34080e 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -1834,7 +1834,7 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine,
const BorderLineModel&
break;
}
case XML_double:lclSetBorderLineWidth( rBorderLine,
API_LINE_THIN, API_LINE_THIN, API_LINE_THIN ); break;
-case XML_hair: lclSetBorderLineWidth( rBorderLine,
API_LINE_HAIR );break;
+case XML_hair: lclSetBorderLineWidth( rBorderLine,
API_LINE_HAIR ); rBorderLine.LineStyle = API_FINE_LINE_DASHED; break;
case XML_medium:lclSetBorderLineWidth( rBorderLine,
API_LINE_MEDIUM ); break;
case XML_mediumDashDot: lclSetBorderLineWidth( rBorderLine,
API_LINE_MEDIUM ); break;
case XML_mediumDashDotDot: lclSetBorderLineWidth( rBorderLine,
API_LINE_MEDIUM ); break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/li
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcplayer.cxx | 16 +-
avmedia/source/vlc/vlcwindow.cpp | 42 +
avmedia/source/vlc/vlcwindow.hxx | 44 +++
3 files changed, 101 insertions(+), 1 deletion(-)
New commits:
commit 71d7d6f5fee1332306ca4b5d12a473c415f81e7c
Author: Minh Ngo
Date: Mon Jun 24 23:08:15 2013 +0300
Lockguards for threadsafe. VLCWindow class templates.
Change-Id: I3e56f1752ebb101f05a231007ffce5cc5b9c97d2
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index b308636..24375ad 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -1,4 +1,5 @@
#include "vlcplayer.hxx"
+#include "vlcwindow.hxx"
using namespace ::com::sun::star;
@@ -21,37 +22,44 @@ VLCPlayer::VLCPlayer()
void SAL_CALL VLCPlayer::start()
{
+::osl::MutexGuard aGuard(m_aMutex);
libvlc_media_player_play( mPlayer.get() );
}
void SAL_CALL VLCPlayer::stop()
{
+::osl::MutexGuard aGuard(m_aMutex);
libvlc_media_player_stop( mPlayer.get() );
}
::sal_Bool SAL_CALL VLCPlayer::isPlaying()
{
+::osl::MutexGuard aGuard(m_aMutex);
return (libvlc_media_player_is_playing( mPlayer.get() ) == 1);
}
double SAL_CALL VLCPlayer::getDuration()
{
+::osl::MutexGuard aGuard(m_aMutex);
libvlc_media_t* media = libvlc_media_player_get_media( mPlayer.get() );
return libvlc_media_get_duration( media );
}
void SAL_CALL VLCPlayer::setMediaTime( double fTime )
{
+::osl::MutexGuard aGuard(m_aMutex);
libvlc_media_player_set_time( mPlayer.get(), fTime );
}
double SAL_CALL VLCPlayer::getMediaTime()
{
+::osl::MutexGuard aGuard(m_aMutex);
return libvlc_media_player_get_time( mPlayer.get() );
}
double SAL_CALL VLCPlayer::getRate()
{
+::osl::MutexGuard aGuard(m_aMutex);
return libvlc_media_player_get_rate( mPlayer.get() );
}
@@ -66,21 +74,25 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet )
void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB )
{
+::osl::MutexGuard aGuard(m_aMutex);
libvlc_audio_set_volume( mPlayer.get(), nDB );
}
::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB()
{
+::osl::MutexGuard aGuard(m_aMutex);
return libvlc_audio_get_volume( mPlayer.get() );
}
void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet )
{
+::osl::MutexGuard aGuard(m_aMutex);
libvlc_audio_set_mute( mPlayer.get(), bSet );
}
::sal_Bool SAL_CALL VLCPlayer::isMute()
{
+::osl::MutexGuard aGuard(m_aMutex);
return libvlc_audio_get_mute( mPlayer.get() );
}
@@ -91,10 +103,12 @@ css::awt::Size SAL_CALL
VLCPlayer::getPreferredPlayerWindowSize()
uno::Reference< css::media::XPlayerWindow > SAL_CALL
VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
{
-return uno::Reference< css::media::XPlayerWindow >();
+::osl::MutexGuard aGuard(m_aMutex);
+return uno::Reference< css::media::XPlayerWindow >(new VLCWindow());
}
uno::Reference< css::media::XFrameGrabber > SAL_CALL
VLCPlayer::createFrameGrabber()
{
+::osl::MutexGuard aGuard(m_aMutex);
return uno::Reference< css::media::XFrameGrabber >();
}
diff --git a/avmedia/source/vlc/vlcwindow.cpp b/avmedia/source/vlc/vlcwindow.cpp
new file mode 100644
index 000..77656eb
--- /dev/null
+++ b/avmedia/source/vlc/vlcwindow.cpp
@@ -0,0 +1,42 @@
+#include "vlcwindow.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia {
+namespace vlc {
+
+void SAL_CALL VLCWindow::pdate()
+{
+}
+
+::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel ZoomLevel )
+{
+return false;
+}
+
+css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel()
+{
+return css::media::ZoomLevel_NOT_AVAILABLE;
+}
+
+void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 SystemPointerType )
+{
+}
+
+::rtl::OUString SAL_CALL VLCWindow::getImplementationName()
+{
+return ::rtl::OUString();
+}
+
+::sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString&
ServiceName )
+{
+return false;
+}
+
+::uno::Sequence< ::rtl::OUString > SAL_CALL
VLCWindow::getSupportedServiceNames()
+{
+return ::uno::Sequence< ::rtl::OUString >();
+}
+
+}
+}
\ No newline at end of file
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
new file mode 100644
index 000..3c4afcb
--- /dev/null
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -0,0 +1,44 @@
+/* -*- 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
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/5b2edaba1347c040b4fa12ad8e67cfda2832a4
8d/5b2edaba1347c040b4fa12ad8e67cfda2832a4 |1 + 1 file changed, 1 insertion(+) New commits: commit 5414810b104a6e766cbf048502432db02d2a10e2 Author: Caolán McNamara Date: Mon Jun 24 20:14:51 2013 +0100 Notes added by 'git notes add' diff --git a/8d/5b2edaba1347c040b4fa12ad8e67cfda2832a4 b/8d/5b2edaba1347c040b4fa12ad8e67cfda2832a4 new file mode 100644 index 000..8c5820b --- /dev/null +++ b/8d/5b2edaba1347c040b4fa12ad8e67cfda2832a4 @@ -0,0 +1 @@ +prefer: db46a7336e330516f4df4e41f6895aa1afb03450 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Joel Madero changed: What|Removed |Added Depends on||44664 -- 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 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Joel Madero changed: What|Removed |Added Depends on|44664 | -- 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/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3d4603e641daf75916648a3e3f1d8f60232efc9d Author: Caolán McNamara Date: Mon Jun 24 20:09:34 2013 +0100 fix typo in higher debug level code Change-Id: I2e30bc94c78dcc4cfb26d5fbde4441fa9f9513f6 diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 2fce91c..176486e 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3901,7 +3901,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) std::fprintf( stderr, "MenuColor = %x (%d)\n", (int)aStyleSet.GetMenuColor().GetColor(), aStyleSet.GetMenuColor().GetLuminance() ); std::fprintf( stderr, "MenuTextColor = %x (%d)\n", (int)aStyleSet.GetMenuTextColor().GetColor(), aStyleSet.GetMenuTextColor().GetLuminance() ); std::fprintf( stderr, "MenuBarColor = %x (%d)\n", (int)aStyleSet.GetMenuBarColor().GetColor(), aStyleSet.GetMenuBarColor().GetLuminance() ); -std::fprintf( stderr, "MenuBarRolloverColor = %x (%d)\n", (int)aStyleSet.GetMenuBarRolloverColor().GetColor(), aStyleSet.GetMenuRolloverBarColor().GetLuminance() ); +std::fprintf( stderr, "MenuBarRolloverColor = %x (%d)\n", (int)aStyleSet.GetMenuBarRolloverColor().GetColor(), aStyleSet.GetMenuBarRolloverColor().GetLuminance() ); std::fprintf( stderr, "MenuBarTextColor = %x (%d)\n", (int)aStyleSet.GetMenuBarTextColor().GetColor(), aStyleSet.GetMenuBarTextColor().GetLuminance() ); std::fprintf( stderr, "MenuBarRolloverTextColor = %x (%d)\n", (int)aStyleSet.GetMenuBarRolloverTextColor().GetColor(), aStyleSet.GetMenuBarRolloverTextColor().GetLuminance() ); std::fprintf( stderr, "LightColor = %x (%d)\n", (int)aStyleSet.GetLightColor().GetColor(), aStyleSet.GetLightColor().GetLuminance() ); ___ 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' - 0e/ceaca6d69c9a196ae860042e2a78d01ea6c8ac
0e/ceaca6d69c9a196ae860042e2a78d01ea6c8ac |1 + 1 file changed, 1 insertion(+) New commits: commit cd41be6485a42c841ae8d3b6979881ab89ef78f6 Author: Caolán McNamara Date: Mon Jun 24 20:06:30 2013 +0100 Notes added by 'git notes add' diff --git a/0e/ceaca6d69c9a196ae860042e2a78d01ea6c8ac b/0e/ceaca6d69c9a196ae860042e2a78d01ea6c8ac new file mode 100644 index 000..4138fd0 --- /dev/null +++ b/0e/ceaca6d69c9a196ae860042e2a78d01ea6c8ac @@ -0,0 +1 @@ +prefer: e9877935b0d09c7a8321632632c440496a957b0c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source cui/uiconfig
cui/source/inc/cuires.hrc |1 +
cui/source/options/optaboutconfig.cxx | 29 +
cui/source/options/optaboutconfig.hxx | 11 +++
cui/source/options/treeopt.cxx|3 +++
cui/uiconfig/ui/aboutconfigdialog.ui |2 +-
5 files changed, 41 insertions(+), 5 deletions(-)
New commits:
commit 04ceced83f76224a0ab1bd270071b541db3ed419
Author: Efe Gürkan YALAMAN
Date: Mon Jun 24 21:50:23 2013 +0300
Initial files are improved.
Some typos fixed on header files.
Change-Id: Ibd6f1b666a3a5b8b6a943b1bffae0be262bcf2fa
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index bdb022d..19a292f 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -155,6 +155,7 @@
#define RID_OFAPAGE_SMARTTAG_OPTIONS(RID_OFA_START + 125)
#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
#define RID_SVXPAGE_OPTIONS_JAVA(RID_SVX_START + 253)
+#define RID_SVXPAGE_ABOUT_CONFIG(RID_SVX_START + 301)
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT(RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
new file mode 100644
index 000..e96829c
--- /dev/null
+++ b/cui/source/options/optaboutconfig.cxx
@@ -0,0 +1,29 @@
+/* -*- 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 "optaboutconfig.hxx"
+
+CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet& rItemSet )
+:SfxTabPage( pParent, "AboutConfig", "cui/ui/optaboutconfigdialog.ui")
+{
+//get(m_pEditBtn, "");
+
+WinBits nBits = WB_SCROLL | WB_SORT;
+pPrefBox = new OptHeaderTabListBox( pPrefCtrl, nbits );
+}
+
+CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
+{
+}
+
+SfxTabPage* CuiAboutConfigTabPage::Create( Window* pParent, const SfxItemSet&
rItemSet )
+{
+return ( new CuiAboutConfigTabPage( pParent, rItemSet) );
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 68fb0c5..3d7859d 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -10,13 +10,13 @@
#ifndef INCLUDED_CUI_OPTABOUTCONFIG_HXX
#define INCLUDED_CUI_OPTBABOUTCONFIG_HXX
-#include
+#include
namespace cui
{
class OptHeaderTabListBox;
}
-
+class CuiAboutConfigTabPage;
class CuiAboutConfigTabPage : public SfxTabPage
{
@@ -31,7 +31,10 @@ public:
CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet );
~CuiAboutConfigTabPage();
- static SfxTabPage* create( Window* pParent, const SfxItemSet& rItemset );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
+
+};
+
+#endif
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 33f2b79..fde7cbd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -32,6 +32,7 @@
#include "dbregisterednamesconfig.hxx"
#include "dialmgr.hxx"
#include "fontsubs.hxx"
+#include "optaboutconfig.hxx"
#include "optaccessibility.hxx"
#include "optasian.hxx"
#include "optchart.hxx"
@@ -317,6 +318,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window*
pParent, const SfxItem
case RID_SVXPAGE_OPTIONS_JAVA: fnCreate =
&SvxJavaOptionsPage::Create ; break;
case RID_SVXPAGE_ONLINEUPDATE: fnCreate =
&SvxOnlineUpdateTabPage::Create; break;
case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate =
&SvxDefaultColorOptPage::Create; break;
+case RID_SVXPAGE_ABOUT_CONFIG: fnCreate =
&CuiAboutConfigTabPage::Create; break;
}
SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL;
@@ -348,6 +350,7 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "ProductName","Accessibility",
RID_SVXPAGE_ACCESSIBILITYCONFIG },
{ "ProductName","Java", RID_SVXPAGE_OPTIONS_JAVA },
{ "ProductName","OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE },
+{ "ProductName","AboutConfig", RID_SVXPAGE_ABOUT_CONFIG },
{ "LanguageSettings", NULL, SID_LANGUAGE_OPTIONS },
{ "LanguageSettings", "Languages",OFA_TP_LANGUAGES },
{ "LanguageSettings", "WritingAids", RID_SFXPAGE_LINGU },
diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui
b/cui/uiconfig/ui/aboutconfigdialog.ui
index 960200e.
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44664, which changed state. Bug 44664 Summary: cups landscape woes with pdf: printer truncates Landscape orientation pages to Portrait dimensions https://bugs.freedesktop.org/show_bug.cgi?id=44664 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |2 -
2 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 159a564288daf285a760a04b1aa1c79be86c0288
Author: Christian Lohmaier
Date: Mon Jun 24 20:18:16 2013 +0200
bump product version to 3.6.8.0+
Change-Id: I4fbbe34b18b706b7b60509434b2ca07b8acac412
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 3de6b07..ecc2df6 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 3.6.7.0
+UREPACKAGEVERSION 3.6.8.0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@ LibreOffice
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .7.0
+SHORT_PRODUCTEXTENSION .8.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.7.0
+ABOUTBOXPRODUCTVERSION 3.6.8.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.7.0
+PACKAGEVERSION 3.6.8.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@ LibreOffice_Dev
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .7.0
+SHORT_PRODUCTEXTENSION .8.0
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.7.0
+ABOUTBOXPRODUCTVERSION 3.6.8.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.7.0
+PACKAGEVERSION 3.6.8.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6.7.0
+PACKAGEVERSION 3.6.8.0
PACKAGEREVISION 1
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.6
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .7.0
+SHORT_PRODUCTEXTENSION .8.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@ LibreOffice_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .7.0
+SHORT_PRODUCTEXTENSION .8.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.7.0
+PACKAGEVERSION 3.6.8.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .7.0
+SHORT_PRODUCTEXTENSION .8.0
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.7.0
+PACKAGEVERSION 3.6.8.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@ LibreOffice_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .7.0
+SHORT_PRODUCTEXTENSION .8.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.7.0
+PACKAGEVERSION 3.6.8.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@ LibreOffice_Dev_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT
[Libreoffice-commits] core.git: bin/lo-xlate-lang
bin/lo-xlate-lang |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40cd5e8f3a390e6d5f69a6045263b1e4554fee11 Author: Rene Engelhard Date: Mon Jun 24 21:00:04 2013 +0200 bin/lo-xlate-lang: fix typo: s/kazahk/kazakh/ Change-Id: I15030064d7b3d380a1b62866019e4f9b6177c180 diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang index 7549f85..ede1b65 100755 --- a/bin/lo-xlate-lang +++ b/bin/lo-xlate-lang @@ -157,7 +157,7 @@ __DATA__ :ka:georgian :eo:esperanto :uk:ukrainian -:kk:kazahk +:kk:kazakh :dz:dzongkha :kn:kannada :gl:galician ___ 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' - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 306ed04b0ac9a166a0a16f0324384d541c7fc0cb Author: Khaled Hosny Date: Mon Jun 24 18:01:04 2013 +0200 fdo#66108 crash in PDF when using Helvetica font When using Helvetica fonts with any character it supports outside Adobe standard font encoding, PDF writer will force font fallback which we do not support in Core Text and AquaSalGraphics will crash. With ATSUI we do not crash, but no characters are output either. This happens because PDF writer registers 14 âvirtualâ standard PDF fonts, including Helvetica, and tries to use them if possible instead of the real font. Now the concept of standard fonts is obsolete, and Adobe now recommends that all fonts are embedded in the PDF, so here I just disable that mechanism when on Mac as a quick fix to avoid the crash, but eventually this stuff should dropped entirely. Change-Id: I3a4d8793d1d2124749372452ffa6ba3145dbd9cd Reviewed-on: https://gerrit.libreoffice.org/4485 Tested-by: Fridrich Strba Reviewed-by: Fridrich Strba diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index b8bd0bc..c478dff 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1723,7 +1723,11 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal m_nCurrentStructElement( 0 ), m_bEmitStructure( true ), m_bNewMCID( false ), +#ifdef MACOSX +m_bEmbedStandardFonts( true ), +#else m_bEmbedStandardFonts( false ), +#endif m_nNextFID( 1 ), m_nInheritedPageWidth( 595 ), // default A4 m_nInheritedPageHeight( 842 ), // default A4 @@ -1840,7 +1844,9 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal if( m_bIsPDF_A1 ) m_aContext.Version = PDFWriter::PDF_1_4; //meaning we need PDF 1.4, PDF/A flavour +#ifndef MACOSX m_bEmbedStandardFonts = m_aContext.EmbedStandardFonts; +#endif } PDFWriterImpl::~PDFWriterImpl() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
need code pointer on basic IDE code
Hi all I experience some nasty latencies in basic IDE switching from a module to another i identified that this is der to the call to "Object catalog" real-time refresh the call stack is http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/basides1.cxx#1035 --> commenting this line, all becomes reactive http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/objdlg.cxx#135 http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/bastype2.cxx#829 On quick hack would be to filter if "object catalog" is displayed or not i need some code pointer to check if the "object catalog" is shown or hidden in order to filter this call http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/basides1.cxx#1035 one deeper (at least for me) work would be to analyze why selecting the current entry in the Tree is so long any help appreciated thanks in advance Laurent ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] libreoffice-3.6.7.1 tag & branch libreoffice-3-6-7 created
Hi *, The tag libreoffice-3.6.7.1 (AKA RC1) has been created along with the corresponding branch libreoffice-3-6-7. The corresponding official builds will be available within next few days. 3.6.7 will be the last release in the 3.6.x line, and there's another rc scheduled for week 28 (Jul 08 - Jul 14) See the attached files for the list of changes against 3.6.6.2. To switch your tree to it, use: ./g fetch --tags ./g checkout -b tag-libreoffice-3.6.7.1 libreoffice-3.6.7.1 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also http://wiki.documentfoundation.org/ReleasePlan/3.6#3.6.7_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Christian commits-libreoffice-3-6-7-release-3.6.7.1.log Description: Binary data bugs-libreoffice-3-6-7-release-3.6.7.1.wiki Description: Binary data bugs-libreoffice-3-6-7-release-3.6.7.1.log Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - include/svx sal/osl svx/source sw/source
include/svx/sdrpaintwindow.hxx|6 +
sal/osl/unx/profile.c | 70 --
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 16 ++---
svx/source/svdraw/sdrpaintwindow.cxx | 27
sw/source/core/view/viewsh.cxx| 49 +--
5 files changed, 108 insertions(+), 60 deletions(-)
New commits:
commit 38dcfadda85058a0ee87292c8943aec82e34b81e
Author: Michael Stahl
Date: Mon Jun 24 19:50:30 2013 +0200
fdo#58029: replace quadratic child window loop with linear
... which should speed things up without introducing problems.
(Window::GetChild(n) is inefficient because the children are a linked
list)
Change-Id: I343d51a6866c5014cbca4c256b0c15f938958c39
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index bf8620c..d1694ee 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -41,6 +41,12 @@ namespace sdr
#endif
+/// paint the transparent children of rWin that overlap rPixelRect
+/// (for example, transparent form controls like check boxes)
+void SVX_DLLPUBLIC
+PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect);
+
+
class SdrPreRenderDevice
{
// The original OutputDevice
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index ecc2c68..1ff7cb9 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
@@ -392,28 +393,12 @@ namespace sdr
{
Window& rWindow = static_cast< Window& >(rmOutputDevice);
-if(rWindow.IsChildTransparentModeEnabled() &&
rWindow.GetChildCount())
-{
-const Rectangle aRegionRectanglePixel(
-maBufferRememberedRangePixel.getMinX(),
maBufferRememberedRangePixel.getMinY(),
-maBufferRememberedRangePixel.getMaxX(),
maBufferRememberedRangePixel.getMaxY());
-
-for(sal_uInt16 a(0); a < rWindow.GetChildCount(); a++)
-{
-Window* pCandidate = rWindow.GetChild(a);
-
-if(pCandidate && pCandidate->IsPaintTransparent())
-{
-const Rectangle
aCandidatePosSizePixel(pCandidate->GetPosPixel(), pCandidate->GetSizePixel());
-
-
if(aCandidatePosSizePixel.IsOver(aRegionRectanglePixel))
-{
-
pCandidate->Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
-pCandidate->Update();
-}
-}
-}
-}
+const Rectangle aRegionRectanglePixel(
+maBufferRememberedRangePixel.getMinX(),
+maBufferRememberedRangePixel.getMinY(),
+maBufferRememberedRangePixel.getMaxX(),
+maBufferRememberedRangePixel.getMaxY());
+PaintTransparentChildren(rWindow, aRegionRectanglePixel);
}
// #i80730# restore visibility of VCL cursor
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index a550c9e..6abacc5 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -23,6 +23,33 @@
#include
#include
+
+void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect)
+{
+if (rWindow.IsChildTransparentModeEnabled())
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+while (pCandidate)
+{
+if (pCandidate->IsPaintTransparent())
+{
+const Rectangle aCandidatePosSizePixel(
+pCandidate->GetPosPixel(),
+pCandidate->GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(rPixelRect))
+{
+pCandidate->Invalidate(
+INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+// important: actually paint the child here!
+pCandidate->Update();
+}
+}
+pCandidate = pCandidate->GetWindow( WINDOW_NEXT );
+}
+}
+}
+
SdrPreRenderDevice::SdrPreRenderDevice(OutputDevice& rOriginal)
diff --git a/sw/source/core/vie
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 43765, which changed state. Bug 43765 Summary: FORMCONTROLS: transparent form controls (Check Boxes and Option Buttons) disappear https://bugs.freedesktop.org/show_bug.cgi?id=43765 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gerrit news sent to fr-qa list
Hi Bjoern, On 24/06/2013 11:47, Bjoern Michaelsen wrote: > Hi Sophie, > > On Sat, Jun 22, 2013 at 09:15:59AM +0200, Sophie Gautier wrote: >> Would it be possible to also send the daily gerrit news mail to >> the fr-qa list? > > Here is a trivial proposal for that: > > https://gerrit.libreoffice.org/#/c/4471/ Thanks a lot! > > It would be great for someone from the french community taking it on > from there (that is: reviewing and pushing it), so that there is no > single point of failure (me) and the local community can update and > adjust to their needs. I'm not sure that we are able to do that, but will have look tomorrow. > > If reviewed, Ill will deploy it (although I might do so after the > gerrit update/outtime on Thursday). Note also you might need to > whitelist/unblock ger...@libreoffice.org for the french QA list for > the messages to come through then. ok, thanks :) Cheers Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] add french QA list to CC, also fix Reply-To address
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4471 Approvals: David Ostrovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4471 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43e6e804024125f17822a993f587a8422b69c1e8 Gerrit-PatchSet: 3 Gerrit-Project: dev-tools Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen Gerrit-Reviewer: Björn Michaelsen Gerrit-Reviewer: David Ostrovsky ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: gerritbot/send-daily-digest
gerritbot/send-daily-digest |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit cfd6f05e7f8e00897652d7c48218ab0f6cedf74e
Author: Bjoern Michaelsen
Date: Mon Jun 24 11:36:36 2013 +0200
add french QA list to CC, also fix Reply-To address
Change-Id: I43e6e804024125f17822a993f587a8422b69c1e8
Reviewed-on: https://gerrit.libreoffice.org/4471
Reviewed-by: David Ostrovsky
Tested-by: David Ostrovsky
diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index 8d92c84..5f8d937 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -54,9 +54,10 @@ Note: The bot generating this message can be found and
improved here:
msg = email.mime.text.MIMEText(body, 'plain', 'UTF-8')
msg['From'] = 'ger...@libreoffice.org'
msg['To'] = 'libreoffice@lists.freedesktop.org'
+msg['Cc'] = 'q...@fr.libreoffice.org'
msg['Date'] = email.utils.formatdate(time.mktime((now.timetuple(
msg['Subject'] = 'LibreOffice Gerrit News %s' % now.date().isoformat()
-msg['Reply-To'] = 'ibreoff...@lists.freedesktop.org'
+msg['Reply-To'] = 'libreoffice@lists.freedesktop.org'
msg['X-Mailer'] = 'LibreOfficeGerritDigestMailer 1.0'
return msg
@@ -65,6 +66,6 @@ if __name__ == '__main__':
parser.add_argument('-g', '--gerrit', help='(i. e. logerrit or
gerrit.libreoffice.org, use alias in your ~/.ssh(config with your public key)',
required=True)
args=vars(parser.parse_args())
server = smtplib.SMTP('localhost')
-server.sendmail('ger...@libreoffice.org',
'libreoffice@lists.freedesktop.org', str(create_message(args['gerrit'], 25)))
+server.sendmail('ger...@libreoffice.org',
['libreoffice@lists.freedesktop.org', 'q...@fr.libreoffice.org'],
str(create_message(args['gerrit'], 25)))
server.quit()
# vim: set et sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-7' - instsetoo_native/util
instsetoo_native/util/openoffice.lst |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit af05c4b9e748ffc70b1b63e2bd156f3363977c82 Author: Christian Lohmaier Date: Mon Jun 24 19:50:57 2013 +0200 bump version to 3.6.7.1+ Change-Id: Ieead905333640210c52d65ac85ff27ff89fc310a diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index e6f32c3..6b4fb6c 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6.7.1 -ABOUTBOXPRODUCTVERSIONSUFFIX +ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.6 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -110,7 +110,7 @@ LibreOffice_Dev BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6.7.1 -ABOUTBOXPRODUCTVERSIONSUFFIX +ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.6 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -380,7 +380,7 @@ OxygenOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6.7.1 -ABOUTBOXPRODUCTVERSIONSUFFIX +ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.6 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-6-7'
New branch 'libreoffice-3-6-7' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-3.6.7.1'
Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier at 2013-06-24 18:09 -0700 Tag libreoffice-3.6.7.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRyH1YAAoJEPQ0oe+v7q6jPe8P/0U9dqYLAnMMs9XI0Ry0rXc4 iyKDeH9N46I90lnKHhtIBVMuUy1CSgYr9jjVo9ZfsQSYT4KYRx36DWXM9p2njkM5 xBQOHgf9+QBIp9Utm3GsAZsFbpQ1Denqn+yN6Mnu5cwcNP5dPab1ajFfqy95RXGR hiORvvdE5FLiGn50ZQWlVG5ZRbtKGrfaPUB8SLQ85I/uOUMJUFWj2c6lhRd0HzgR QK8YaQQ0+bEmzFFEEOA88GWW/gkJVi9lNpS6IMO272k3On9r6cxNq8EXax1IZTeq RPcHmqfP5sWKuVEmsQvhG4rgn/GqL+qRCDD4PYOp5Mwedbyu/8lT0BFcC2ntt9Rg xpOwsAF4m/cTWxPekfUk3mgfi/gHz0a4tGMN7O4rdShQ96XbZ8Qs3XVjf6jvbU3p O4HFbJVraOQVy1vPJRP1GQ9rENPntScgGPvzsHgz5g36wV+lztHxdlv2RDfJl+Ku x8pnkvBHb3/kIs6wZYPDBX8fWZ7PWr3Yeu4CanMkHdd318pKC5bqvFQHouaSwZyt gQ0nqmGXNmkCgMUs8vdfov7K3FKnRQG36d94krGvO/8Yap/uu3i6Piruh6+/1GSc F494N/R+Ow7rl/yY44Wh5/Fe69HHgmozqNmHmlGH/erxcdutG622IcYG0LiU+a78 A6BWmRg+JOd/wAYPx8En =tdaa -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-37: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-3-6-7'
New branch 'libreoffice-3-6-7' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-3-6-7'
New branch 'libreoffice-3-6-7' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-3-6-7'
New branch 'libreoffice-3-6-7' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-3-6-7'
New branch 'libreoffice-3-6-7' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-3.6.7.1'
Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier at 2013-06-24 18:09 -0700 Tag libreoffice-3.6.7.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRyH1TAAoJEPQ0oe+v7q6j5yEP/3zkj6IYYQ7Vldz9pw/O+8I3 hWi7J/BK37hyFf6BdOLZqPqVBZ3T/F2B2IEdldXEy6Kw83sE6JYmCWYn+iiPnhAv LuQp85QhMiVPh2hknrZsd3qJHMZyR88BiHWbV/li9RluUJc0wZlvvynQBmLAgfg/ ASpBilvTjTdH0YhiZXtsRk8rkWMu2J2gDs3gm8q8N2UhWcSyjoQmsZxMDSyu67q9 ShCj4vzwqSmP/rg6x2a3+IgBYXXQUhOuf1qJzFqHiGxxjY/PMF8uuqtKZyhg2Qkn co3uJ2kPdqzOOMnxOlOMt8UKCNdievn+8AZ2ny40xL8XcwmRh2NFnX3xQxw2QJ3Q HAOeafM3qQ0Z3GjqYqZjGtFp/YdoSf5kZw8QEkkjvnJtT4ZWAPkKCTQao7HK6Poq 1E7IJJpKWzSTGSGGBKV1LmA0ohOiQixjsfS0pDu68m8VeROdKybnq/kt6K/Pydw8 xyI++kM6BaxRZB92vsZXHxx04iIvVavxCPRtK6pLIkDQE7maHUeeQwcbkYbINSYO jEwyHfr1nGpuXDL9A9YzsHhcdjEdgxNG/OXRieP/Id3VBPPTq4MqfQRsgbXejBCg AEkOCg+39aM4VgJFnLKYhHDk5kQOiyWYKKIgry528SIQMUFGIW/UdhFx7oxqDkaS i0yZrLb2sbcmPWniwv3J =b9s9 -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-1142: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-3.6.7.1'
Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier at 2013-06-24 18:09 -0700 Tag libreoffice-3.6.7.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRyH1WAAoJEPQ0oe+v7q6jTj8P/0n2Q/llrfUSFUfw2MJpvEap R/cPYYGUcW4ttEV6pDsemVsReap74Bq9BxaLsserhQgpNVolOpodq0aA/A7eNxGQ Lfm1Fq23+PROrEZNhR16cJ5PsmeYUk383dxPKWXX9xfOWucvzLrjqTduEyymxXMA 4fG+CXRQVYRLkrALm5poM59oIbhKZt55pn5h7vl3YMmwX/7aUPM2b+JUKTU/xmLP topa6qwjQfmgS/qw6qywS17M+8zsF8P0pA7qe7x7dsS/VGTe/dKQbX1iYHhyBCkr p5EszdkTWPgb4HSDtH439SqhQrKLbgH+nVl/GKKOiDek5S2c81I0/VUFGmyvyOCg Z2/8m24qGSadW3X8Errur7lXgUKlHWj4rbDQKWFSzx2Do9st9gNsmJXO5RAzz1SR FaiR+5bfgdloMjLtlmbOJTi41SSiwr77kKXgrZoLPSPFyDlgdMVW7L7woQU2t5uZ Q141PiRWR0ixTbzUJtS5RtIQ+a/j9O9B9xDYN+3wX5kCKJ6tsREqa9ofItUV/7pc IuAtgL+0+e6Lu3J+E12340kpMsGI21a+OO/cdnADULV1sqDIYpj9HE/sK8mU8lUe yVgrwl5Tcei0X5XynPIN6TDNaz4AiiwZm2g4ZZuzCjvCHbdlZnwmiBkzbmhjCdFb irKLoC5VTBQrAXq9d2tw =UMLJ -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-19: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-3.6.7.1'
Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier at 2013-06-24 18:09 -0700 Tag libreoffice-3.6.7.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRyH1XAAoJEPQ0oe+v7q6jt60P/3hjGZW4vWeOpM/Kj3CD62m2 6aLGxcc+oi30UZqREw4VIsqs/MreOVg0yi6UQg3Wv2TXHDWgV1e52u03uG5a7riP upG3sfArc13yj/Jaegm4z84hSXrSPpBTMSoD503aqCXZ23SUdm/DjvbHuzyI5knJ +0xzH0AsTSmKLU75rzMICHXlhLks7sjh7h5TT1YrqoxVzuXMTfVOM2Y5Wn/Dc4mt 1XrliaSsd8XYDARwdtmB1t8e2d/IVdwRr07x+iGjOKES8qpl3/sJDW1uEcYodne+ Bd/v9fsZH5WRw8KxPgcjjo9iiBn12/zOnDBn8JIO4p4suSPJS9zcTpcZRwZ9KKyo xPO3JHihL6w7RT2ri0aSgZiqhtX3yqP8clugZExPaDk2aMh2m+pvZcZ8W+6D3scW 9NE2pQm3Io0gAH/eACOI2hE9v7W9Fop/m0XGJW/TNKtVWuw9HizD4GYsiJ9hfVMP SxjGgCIbxrQMD7j/yJJuinxSFYALZMitO4Z7hm7QmflJZaBJQf6G/hzoZ8maq7fB tCEsRpZk2p1wKTpQtwwt1qVac2aZwbhlAhStsKBXpfouwCrm0cvpt6Hu2FZM0C1z OgBYY0xZOBUVv//pHlYalFnMRwUdBLJWjQdJYOpW1FvBwSX6Met1qWhAVd4wuysC Yxx8THUVaY04J0PoVh62 =4uhF -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-29: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.7.1'
Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier at 2013-06-24 18:09 -0700 Tag libreoffice-3.6.7.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRyH1VAAoJEPQ0oe+v7q6jtRUQAI0yQ4bG5ir/VAV84xswDyDv 1uNLN1yzsnFvZY3mAwfszl0rwSMStOJkdf4ksWyz+A8FV1Co5GVJEEWhVCtcoen0 L6UY+TXPDBxnh9a3Q3E2qpeU5JysEewcS6eQYd0zzzfcyMEfRq/acviXQbZ/X82n 2YI0uWz1S0T3cGzm/31xvgMmmgATmXgstQs7rEUzztWH5See2WVIHtU2nGXZvdSw Ocg1DBoHRDE0L/s3QiW5zDOa5RroupTIv9HjnD7XD7JTXwRF/FUBRW59T6wtRjFi fo//IMVDNcVs29yffwSx1J8J7Y/yxLgaoFRcThJKTUCN+xRLY8ctN2frDaTBg8id 6Urxlv+58QCHeZZ9tW4fxf85jq4jqMwvXcHOYfeZ4+oppa6hizOb7RMIv2LepLz/ vgvmk9jWKM17zJ6j3KEkq63E54+XlNnkGmbjaY/OHBEhLqS66ST5iDVQjFS42ORc l1t3d7h9JTMO318QR+6K9elieKV7/yW4+wJ6sU2BFgX+2om1S/vCkzCUNFF7TAaG WijL5JHTuJI46W6EJW9D2yErP8H7al37OKE17IV54GQyW505uqhWuvNgM4jBmvzP aCgZN2WGhEE3jiRBvsqdXrsWm0W1HfzhheEgw5gKjhb7FKFINHvTV5LlR26yjw7k Eo+pkrtj/Miu6frlnvj5 =3hKV -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig include/vcl sfx2/uiconfig vcl/source
cui/uiconfig/ui/pastespecial.ui |1 +
include/vcl/edit.hxx |3 +++
sfx2/uiconfig/ui/documentinfopage.ui |2 ++
vcl/source/control/edit.cxx | 20 +++-
4 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 112ce9b1dc1cbf34bb6378ff2e61dba6144782c9
Author: Caolán McNamara
Date: Mon Jun 24 12:42:39 2013 +0100
Resolves: fdo#66105 set max growth width for labels/edits which take paths
Change-Id: I12220821f76550baacdc8ce604f2e612d260c1a1
(cherry picked from commit 9495e912797f67897a4a658d20137bb94f39e9ab)
Reviewed-on: https://gerrit.libreoffice.org/4481
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui
index fb08b9e..3eb4e7d 100644
--- a/cui/uiconfig/ui/pastespecial.ui
+++ b/cui/uiconfig/ui/pastespecial.ui
@@ -97,6 +97,7 @@
True
False
True
+72
False
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 11c1ae8..6df1f7b 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -71,6 +71,7 @@ private:
sal_uInt16 mnAlign;
xub_StrLen mnMaxTextLen;
sal_Int32 mnWidthInChars;
+sal_Int32 mnMaxWidthChars;
AutocompleteAction meAutocompleteAction;
sal_Unicode mcEchoChar;
sal_BoolmbModified:1,
@@ -193,6 +194,8 @@ public:
voidSetWidthInChars(sal_Int32 nWidthInChars);
sal_Int32 GetWidthInChars() const { return mnWidthInChars; }
+voidsetMaxWidthChars(sal_Int32 nWidth);
+
virtual voidSetSelection( const Selection& rSelection );
virtual const Selection&GetSelection() const;
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui
b/sfx2/uiconfig/ui/documentinfopage.ui
index eeccbd0..f25a95a 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -275,6 +275,7 @@
False
0
True
+56
1
@@ -336,6 +337,7 @@
False
0
True
+56
1
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 20323b3..e8798a2 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -214,10 +214,21 @@ void Edit::SetWidthInChars(sal_Int32 nWidthInChars)
}
}
+void Edit::setMaxWidthChars(sal_Int32 nWidth)
+{
+if (nWidth != mnMaxWidthChars)
+{
+mnMaxWidthChars = nWidth;
+queue_resize();
+}
+}
+
bool Edit::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "width-chars")
SetWidthInChars(rValue.toInt32());
+else if (rKey == "max-width-chars")
+setMaxWidthChars(rValue.toInt32());
else if (rKey == "max-length")
{
sal_Int32 nTextLen = rValue.toInt32();
@@ -295,6 +306,7 @@ void Edit::ImplInitEditData()
mnAlign = EDIT_ALIGN_LEFT;
mnMaxTextLen= EDIT_NOLIMIT;
mnWidthInChars = -1;
+mnMaxWidthChars = -1;
meAutocompleteAction= AUTOCOMPLETE_KEYINPUT;
mbModified = sal_False;
mbInternModified= sal_False;
@@ -2886,8 +2898,14 @@ Size Edit::CalcMinimumSizeForText(const OUString
&rString) const
}
else
{
+OUString aString;
+if (mnMaxWidthChars != -1 && mnMaxWidthChars < rString.getLength())
+aString = rString.copy(0, mnMaxWidthChars);
+else
+aString = rString;
+
aSize.Height() = GetTextHeight();
-aSize.Width() = GetTextWidth(rString);
+aSize.Width() = GetTextWidth(aString);
aSize.Width() += ImplGetExtraOffset() * 2;
// do not create edit fields in which one cannot enter anything
// a default minimum width should exist for at least 3 characters
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH]fdo#55846 Comboboxes werent displayed in vertical toolbars
Hey !
Its been a little while i havent been on code due to bad health :( .
I just talked to Eike regarding this bug which i have been working on
since late. i think it is a long time this bug has been pending. I am
done with the code , but yeah definitely i agree to the fact that
there might be UI problems ( though it works on my machine) i think
there can be made some change other than the hard coded values i have
used.
It would be great if someone can guide me on this so that i dont use
the hard coded values and have some other way to solve this bug.
Regards,
Janit
On 5/19/13, Janit Anjaria wrote:
> Hey!
> I have taken a look into all the mentioned effects , but i still have a
> doubt regarding the constant value i have subtracted/added for the UI
> matter.
> As Eike mentiones i have removed the direct use of the value , rather
> replaced it with a variable holding that value .
>
> --> The question that arises is that the UI will surely depend on the
> screen size and also on the Operating System and hence the screen
> resolution.So how to overcome this issue of UI such that i can write some
> generalised code for the same.
>
> Any help would be appreciated.
>
> Regards,
> Janit
>
>
> On Sat, May 18, 2013 at 2:03 AM, Eike Rathke wrote:
>
>> Hi Janit,
>>
>> On Wednesday, 2013-04-24 00:51:59 +0530, Janit Anjaria wrote:
>>
>> > I am hereby submitting my patch.
>>
>> Sorry, that was lingering on the list too long. I'd also suggest that
>> you don't explicitly Cc a developer when submitting a patch on the
>> mailing list if s/he didn't ask for it. It leaves the impression to
>> others reading the list that the dev on Cc would be responsible. Which
>> I am not ;-)
>>
>>
>> > diff --git a/vcl/source/window/toolbox.cxx
>> b/vcl/source/window/toolbox.cxx
>> > @@ -239,16 +239,16 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign,
>> long& rLeft, long& rTop,
>> >
>> > if ( eAlign == WINDOWALIGN_TOP )
>> > {
>> > -rLeft = borderwidth+dragwidth;
>> > +rLeft = borderwidth+dragwidth-150;
>>
>> How did you derive the hardcoded value 150, where does it originate? To
>> me it seems to be a value that by chance matches your screen,
>> resolution, window size, current width of pane, and maybe more. It does
>> not seem to be a generally applicable value. On the other hand, if it
>> really was, a named constant value would be much better suited than
>> repeating the hard coded value in several places throughout the code.
>>
>> > else if ( eAlign == WINDOWALIGN_LEFT )
>> > {
>> > -rLeft = borderwidth;
>> > +rLeft = borderwidth-120;
>>
>> Same here, 120 what and why?
>>
>> > -rRight = 0;
>> > +rRight = 15;
>>
>> And this 15?
>>
>>
>> > @@ -730,7 +730,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis,
>> sal_uInt16 nCalcLines, sal_uIn
>> > else if ( nCalcMode == TB_CALCMODE_VERT )
>> > {
>> > pThis->mpData->mbAssumeDocked = sal_True; // force
>> non-floating mode during calculation
>> > -ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight,
>> nBottom, pThis );
>> > + ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight,
>> nBottom, pThis );
>>
>> Please don't screw up existing indentation if it is reasonable.
>>
>> > -aSize.Width() = nCalcLines * pThis->mnMaxItemWidth;
>> > +aSize.Width() = ((nCalcLines) *
>> > ((pThis->mnMaxItemWidth)));
>>
>> The extra parentheses here only make the code harder to read and are not
>> needed.
>>
>>
>> > @@ -1919,7 +1919,8 @@ sal_Bool ToolBox::ImplCalcItem()
>> > if( it->mbVisibleText && !mbHorz )
>> > {
>> > long tmp = it->maItemSize.Width();
>> > -it->maItemSize.Width() = it->maItemSize.Height();
>> > + //fdo#55846 The UI for the same is managed by changing
>> > the
>> snippet here.
>> > +it->maItemSize.Width() = it->maItemSize.Height() +
>> 150;
>>
>> The 150 again.
>> And please align comments with the code.
>> The wording of the comment is not really helpful. It only states that
>> something is done but does not explain. "the UI is managed by changing
>> the snippet" doesn't mean anything to me. Comments, if necessary, should
>> explain why something is done in the code, or clarify the non-obvious.
>>
>>
>> > @@ -1967,13 +1968,15 @@ sal_Bool ToolBox::ImplCalcItem()
>> > // it is only required for docked toolbars
>> >
>> > long nFixedWidth = nDefWidth+nDropDownArrowWidth;
>> > -long nFixedHeight = nDefHeight;
>> > +
>> > + long nFixedHeight = nDefHeight;
>>
>> Again, please don't screw up existing indentation if it is reasonable.
>>
>> > else
>> > -nMaxWidth = nFixedWidth;
>> > + //fdo#55846(for maintaining and checking the UI the constant is
>> added)
>> > +nMaxWidth = nFixedWidth + 250;
>>
>> Why is it the value 250?
>> And please align comments with t
Re: Updates about Enhanced Database Ranges.
Hello all, The progress so far is: +Reading OOXML data from /styles.xml for Table styles. +Imports Table Style Elements successfully, for first-second column and first-second row data. +Imports the Table styles as a whole represented by the ScDBDataFormatting class in calc, also imports the table style name +Nearing completion of associating ScDBData ranges with related ScDBDataFormatting objects. This means processing the /table/*.xml files' tag. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source
i18npool/source/search/textsearch.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8d5b2edaba1347c040b4fa12ad8e67cfda2832a4
Author: Herbert Dürr
Date: Mon Jun 24 14:55:16 2013 +
#i121880# fix case-sensitive non-regexp text search
Patch by: Tsutomu Uchino
Review by: Herbert Duerr
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index f1c19c7..5c8dac6 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -64,7 +64,8 @@ static sal_Int32 COMPLEX_TRANS_MASK_TMP =
TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
TransliterationModules_ignoreProlongedSoundMark_ja_JP;
static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP |
TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
-static const sal_Int32 SIMPLE_TRANS_MASK = ~(COMPLEX_TRANS_MASK |
TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE
| TransliterationModules_LOWERCASE_UPPERCASE);
+static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
+static const sal_Int32 REGEX_TRANS_MASK = ~(COMPLEX_TRANS_MASK |
TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE
| TransliterationModules_LOWERCASE_UPPERCASE);
// Above 2 transliteration is simple but need to take effect in
// complex transliteration
@@ -705,7 +706,7 @@ void TextSearch::RESrchPrepare( const
::com::sun::star::util::SearchOptions& rOp
{
// select the transliterated pattern string
const OUString& rPatternStr =
-(rOptions.transliterateFlags & SIMPLE_TRANS_MASK) ? sSrchStr
+(rOptions.transliterateFlags & REGEX_TRANS_MASK) ? sSrchStr
: ((rOptions.transliterateFlags & COMPLEX_TRANS_MASK) ? sSrchStr2 :
rOptions.searchString);
sal_uInt32 nIcuSearchFlags = UREGEX_UWORD; // request UAX#29 unicode
capability
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/glyphs/gcach_layout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ec6baba68aba6a66d161e545f0f7808f57ff011 Author: Caolán McNamara Date: Mon Jun 24 16:20:51 2013 +0100 Resolves: fdo#66042 get the bounds of the current grapheme Change-Id: I5b1808d74f0a1dd0d8b6ea22136e574c0a6e8e2a diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 4826936..0f69e59 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -111,7 +111,7 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos OUString aRun(rArgs.mpStr); sal_Int32 nDone; sal_Int32 nGraphemeStartPos = -mxBreak->previousCharacters(aRun, nCharPos, aLocale, +mxBreak->previousCharacters(aRun, nCharPos+1, aLocale, i18n::CharacterIteratorMode::SKIPCELL, 1, nDone); sal_Int32 nGraphemeEndPos = mxBreak->nextCharacters(aRun, nCharPos, aLocale, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 22 --
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 +
writerfilter/source/rtftok/rtfsdrimport.cxx| 17 ++---
3 files changed, 31 insertions(+), 9 deletions(-)
New commits:
commit 90aaecc1b4c62afcd41d988e4561c615403121a5
Author: Miklos Vajna
Date: Mon Jun 24 14:13:39 2013 +0200
bnc#823655 fix RTF import of freeform shape coordinates
E.g. 0,1 was imported as 1,0, as we did not differentiate between not
having the coordinate yet and having it as zero.
(cherry picked from commit fe8d6ffa05c467bddb3480e43d7043a3d3c9)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 0258fe3..ebcd21f 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -40,6 +40,7 @@
#include
#include "../dmapper/GraphicHelpers.hxx"
#include
+#include
using rtl::OString;
using rtl::OStringBuffer;
@@ -173,19 +174,19 @@ void RTFSdrImport::resolve(RTFShape& rShape)
// The coordinates are in an (x,y) form.
aToken = aToken.copy(1, aToken.getLength() - 2);
sal_Int32 nI = 0;
-sal_Int32 nX = 0;
-sal_Int32 nY = 0;
+boost::optional oX;
+boost::optional oY;
do
{
OUString aPoint = aToken.getToken(0, ',', nI);
-if (!nX)
-nX = aPoint.toInt32();
+if (!oX)
+oX.reset(aPoint.toInt32());
else
-nY = aPoint.toInt32();
+oY.reset(aPoint.toInt32());
}
while (nI >= 0);
-aCoordinates[nIndex].First.Value <<= nX;
-aCoordinates[nIndex].Second.Value <<= nY;
+aCoordinates[nIndex].First.Value <<= *oX;
+aCoordinates[nIndex].Second.Value <<= *oY;
nIndex++;
}
}
commit 4869de23a6cc8d1f21041f856bac6822bbe963b1
Author: Eilidh McAdam
Date: Wed Sep 19 09:45:49 2012 +0100
bnc#823655 Import RTF shape wrap property.
Property \shpwrN, where N can be
1: Wrap at top and bottom (no wrap at sides)
2: Wrap around shape
3: None (wrap as though shape isn't there)
4: Wrap tightly around shape
5: Wrap text through shape
Reviewed-on: https://gerrit.libreoffice.org/647
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit d56e7c9011e662b39f0e9775e654f62cea8765c2)
Change-Id: Ic700e06bf9ef894a6efa7e8d033888ed80a7082f
Signed-off-by: Miklos Vajna
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a89b3c0..67a26e3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -617,7 +618,6 @@ int RTFDocumentImpl::resolvePict(bool bInline)
{
SvMemoryStream aStream;
SvStream *pStream = 0;
-
if (!m_pBinaryData.get())
{
pStream = &aStream;
@@ -2692,6 +2692,23 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_WrapSquare_wrapText,
pValue);
}
break;
+case RTF_SHPWR:
+{
+switch (nParam)
+{
+case 1:
+m_aStates.top().aShape.nWrap =
com::sun::star::text::WrapTextMode_NONE; break;
+case 2:
+m_aStates.top().aShape.nWrap =
com::sun::star::text::WrapTextMode_PARALLEL; break;
+case 3:
+m_aStates.top().aShape.nWrap =
com::sun::star::text::WrapTextMode_THROUGHT; break;
+case 4:
+m_aStates.top().aShape.nWrap =
com::sun::star::text::WrapTextMode_PARALLEL; break;
+case 5:
+m_aStates.top().aShape.nWrap =
com::sun::star::text::WrapTextMode_THROUGHT; break;
+}
+}
+break;
case RTF_CELLX:
{
int nCellX = nParam - m_aStates.top().nCellX;
@@ -3878,7 +3895,8 @@ RTFShape::RTFShape()
nRight(0),
nBottom(0),
nHoriOrientRelation(0),
-nVertOrientRelation(0)
+nVertOrientRelation(0),
+nWrap(-1)
{
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e5/8fe7afee5163833479b76a474416a77d95f075
e5/8fe7afee5163833479b76a474416a77d95f075 |1 + 1 file changed, 1 insertion(+) New commits: commit a1e37ab69a3b81cfcf94a02524de3ab3affabcc3 Author: Caolán McNamara Date: Mon Jun 24 16:08:33 2013 +0100 Notes added by 'git notes add' diff --git a/e5/8fe7afee5163833479b76a474416a77d95f075 b/e5/8fe7afee5163833479b76a474416a77d95f075 new file mode 100644 index 000..911ba83 --- /dev/null +++ b/e5/8fe7afee5163833479b76a474416a77d95f075 @@ -0,0 +1 @@ +merged as: 91b8728108193706e142c25903c0dcd4ea8b0b21 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/svl sc/source sd/source svl/source
editeng/source/editeng/impedit2.cxx | 44 +---
include/svl/undo.hxx| 13 ++-
sc/source/ui/inc/undobase.hxx |4 -
sc/source/ui/inc/undodraw.hxx |4 -
sc/source/ui/undo/undobase.cxx | 12 ---
sc/source/ui/undo/undodraw.cxx | 12 ---
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx |6 +
svl/source/undo/undo.cxx| 57 +++-
8 files changed, 88 insertions(+), 64 deletions(-)
New commits:
commit 91b8728108193706e142c25903c0dcd4ea8b0b21
Author: Armin Le Grand
Date: Sun Jun 23 11:25:32 2013 +
Resolves: #i120020# corrected paragraph merge...
corresponding undo and ownership of linked undo actions
(cherry picked from commit e58fe7afee5163833479b76a474416a77d95f075)
Conflicts:
editeng/source/editeng/impedit2.cxx
sc/source/ui/undo/undobase.cxx
sc/source/ui/undo/undodraw.cxx
svl/inc/svl/undo.hxx
Change-Id: I6672990558a496dfc692554437897d013e258f40
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 4bc6d70..d6e1de5 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2185,6 +2185,16 @@ EditPaM ImpEditEngine::ImpConnectParagraphs(
ContentNode* pLeft, ContentNode* pR
OSL_ENSURE( aEditDoc.GetPos( pLeft ) != EE_PARA_NOT_FOUND, "Inserted node
not found (1)" );
OSL_ENSURE( aEditDoc.GetPos( pRight ) != EE_PARA_NOT_FOUND, "Inserted node
not found (2)" );
+// #i120020# it is possible that left and right are *not* in the desired
order (left/right)
+// so correct it. This correction is needed, else an invalid
SfxLinkUndoAction will be
+// created from ConnectParagraphs below. Assert this situation, it should
be corrected by the
+// caller.
+if(aEditDoc.GetPos( pLeft ) > aEditDoc.GetPos( pRight ))
+{
+OSL_ENSURE(false, "ImpConnectParagraphs wit wrong order of
pLeft/pRight nodes (!)");
+std::swap(pLeft, pRight);
+}
+
sal_Int32 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uIntPtr)pRight,
nParagraphTobeDeleted );
aDeletedNodes.push_back(pInf);
@@ -2301,18 +2311,34 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const
EditSelection& rSel, sal_uInt8 n
else if ( nDelMode == DELMODE_RESTOFWORD )
{
aDelEnd = EndOfWord( aCurPos );
+
if (aDelEnd.GetIndex() == aCurPos.GetIndex())
{
-xub_StrLen nLen = aCurPos.GetNode()->Len();
-// end of para?
-if (aDelEnd.GetIndex() == nLen)
-aDelEnd = WordLeft( aCurPos );
-else // there's still sth to delete on the right
+const xub_StrLen nLen(aCurPos.GetNode()->Len());
+
+// #i120020# when 0 == nLen, aDelStart needs to be adapted, not
+// aDelEnd. This would (and did) lead to a wrong order in the
+// ImpConnectParagraphs call later.
+if(nLen)
+{
+// end of para?
+if (aDelEnd.GetIndex() == nLen)
+{
+aDelEnd = WordLeft( aCurPos );
+}
+else // there's still sth to delete on the right
+{
+aDelEnd = EndOfWord( WordRight( aCurPos ) );
+// if there'n no next word...
+if (aDelEnd.GetIndex() == nLen )
+{
+aDelEnd.SetIndex( nLen );
+}
+}
+}
+else
{
-aDelEnd = EndOfWord( WordRight( aCurPos ) );
-// if there'n no next word...
-if (aDelEnd.GetIndex() == nLen )
-aDelEnd.SetIndex( nLen );
+aDelStart = WordLeft(aCurPos);
}
}
}
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index f36cd81..c1054a6 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -46,17 +46,20 @@ public:
};
//
+class SfxLinkUndoAction;
class SVL_DLLPUBLIC SfxUndoAction
{
-sal_Bool bLinked;
+private:
+SfxLinkUndoAction* mpSfxLinkUndoAction;
+
public:
TYPEINFO();
SfxUndoAction();
virtual ~SfxUndoAction();
-virtual sal_BoolIsLinked();
-virtual voidSetLinked( sal_Bool bIsLinked = sal_True );
+virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction*
pSfxLinkUndoAction);
+
v
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/edit.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit b139f6fedfcf3cbed0eadeb007e2155b576413d2
Author: Tor Lillqvist
Date: Mon Jun 24 18:04:09 2013 +0300
Remove leftover debugging printf
Besides, it caused a WaE: format '%d' expects argument of type 'int', but
argument 3 has type 'sal_Int32 {aka long int}'
Change-Id: Ib0360816e7d0a4829aff4267aa922269950d520c
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 70f19f9..513047c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -219,7 +219,6 @@ void Edit::setMaxWidthChars(sal_Int32 nWidth)
if (nWidth != mnMaxWidthChars)
{
mnMaxWidthChars = nWidth;
-fprintf(stderr, "setMaxWidthChars of %d\n", nWidth);
queue_resize();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/n823655.rtf| 48 +
sw/qa/extras/rtfimport/data/para-bottom-margin.rtf | 14 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 34 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +
writerfilter/source/rtftok/rtfsdrimport.cxx| 14 +++---
5 files changed, 106 insertions(+), 7 deletions(-)
New commits:
commit 48a25944a8bc00f4cac90c602c01f9f1ecd63256
Author: Miklos Vajna
Date: Mon Jun 24 14:13:39 2013 +0200
bnc#823655 fix RTF import of freeform shape coordinates
E.g. 0,1 was imported as 1,0, as we did not differentiate between not
having the coordinate yet and having it as zero.
Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4
(cherry picked from commit fe8d6ffa05c467bddb3480e43d7043a3d3c9)
diff --git a/sw/qa/extras/rtfimport/data/n823655.rtf
b/sw/qa/extras/rtfimport/data/n823655.rtf
new file mode 100644
index 000..94e73ed
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n823655.rtf
@@ -0,0 +1,48 @@
+{\rtf1
+foo
+{\shp
+{\*\shpinst\shpleft450\shptop1904\shpright11595\shpbottom2190\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz0\shplid1026
+{\sp
+{\sn shapeType}
+{\sv 0}
+}
+{\sp
+{\sn fFlipH}
+{\sv 0}
+}
+{\sp
+{\sn fFlipV}
+{\sv 0}
+}
+{\sp
+{\sn geoRight}
+{\sv 11145}
+}
+{\sp
+{\sn geoBottom}
+{\sv 286}
+}
+{\sp
+{\sn pVerticies}
+{\sv 8;4;(0,286);(11145,286);(11145,1);(0,1)}
+}
+{\sp
+{\sn pSegmentInfo}
+{\sv 2;5;16384;1;1;1;32768}
+}
+{\sp
+{\sn fFillOK}
+{\sv 1}
+}
+{\sp
+{\sn fillColor}
+{\sv 15000804}
+}
+{\sp
+{\sn fFilled}
+{\sv 1}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index d3362da..84d59c0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -27,6 +27,7 @@
#include
#include
+#include
#include
#include
#include
@@ -151,6 +152,7 @@ public:
void testFdo64671();
void testN825305();
void testParaBottomMargin();
+void testN823655();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -272,6 +274,7 @@ void Test::run()
{"fdo64671.rtf", &Test::testFdo64671},
{"n825305.rtf", &Test::testN825305},
{"para-bottom-margin.rtf", &Test::testParaBottomMargin},
+{"n823655.rtf", &Test::testN823655},
};
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1252,6 +1255,29 @@ void Test::testParaBottomMargin()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(getParagraph(1),
"ParaBottomMargin"));
}
+void Test::testN823655()
+{
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Sequence aProps = getProperty<
uno::Sequence >(xDraws->getByIndex(0),
"CustomShapeGeometry");
+uno::Sequence aPathProps;
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+if (rProp.Name == "Path")
+aPathProps = rProp.Value.get< uno::Sequence
>();
+}
+uno::Sequence aCoordinates;
+for (int i = 0; i < aPathProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aPathProps[i];
+if (rProp.Name == "Coordinates")
+aCoordinates = rProp.Value.get<
uno::Sequence >();
+}
+// The first coordinate pair of this freeform shape was 286,0 instead of
0,286.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(286),
aCoordinates[0].Second.Value.get());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3bb7af9..62a6cb5 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -192,19 +192,19 @@ void RTFSdrImport::resolve(RTFShape& rShape)
// The coordinates are in an (x,y) form.
aToken = aToken.copy(1, aToken.getLength() - 2);
sal_Int32 nI = 0;
-sal_Int32 nX = 0;
-sal_Int32 nY = 0;
+boost::optional oX;
+boost::optional oY;
do
{
OUString aPoint = aToken.getToken(0, ',', nI);
-if (!nX)
-nX = aPoint.toInt32();
+if (!oX)
+oX.reset(aPoint.toInt32());
else
-nY = aPoint.toInt32();
+oY.reset(aPoint.toInt32());
}
while (nI >= 0);
-aCoordinates[nIndex].First.Value <<= nX;
-aCoordinates[nIndex].Second.Value <<= nY;
+aCoordinates[nIndex].First
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/effectproperties.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7552edf94052784962de58229c9c844bf345b55a Author: Tor Lillqvist Date: Mon Jun 24 17:42:39 2013 +0300 Fix typo in Emacs mode line Change-Id: I882a24a665a721420c8ec99288f399abf4fdbca1 diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx index 799169b..caaf61f 100644 --- a/oox/source/drawingml/effectproperties.cxx +++ b/oox/source/drawingml/effectproperties.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-baosic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Thoughts on LibreOffice Math
Can you please describe in more details what is wrong with the exported
MathML? LibreOffice uses "Presentation Markup" and not "Content Markup".
But besides that, what is bad?
For example,
- If you type "1 + 2x" then "2x" is interpreted as a single number
rather than a number times a variable.
- If you add a space like "1 + 2 x", then it is now interpreted as
"{1+2} times x"
- If you type "a+b+c+d+e+..." you'll get a nested mrow structure like
{a+b} + c}+d}+e}+...} which is correct but very inconvenient to
browse e.g. for accessibility tools. The operators of same priority
could be grouped in the same row.
- Other commands like wide accents, math symbols or overstrike are lost
are badly exported to MathML.
I don't want to give the details here, but I'm going to open bugs and
submit patches when I have time:
https://www.libreoffice.org/bugzilla/buglist.cgi?emailreporter1=1&query_format=advanced&email1=fred.wang%40free.fr&component=Formula%20Editor&product=LibreOffice
MathML import and export is already available. What is needed in addition?
Yes, I didn't mean it is not supported, but just wanted to list some
features that I think people would like to implement or keep in any
future versions of Math. Note that:
- MathML export has some bugs but I hope it won't be too difficult to fix.
- A MathML or LaTeX import is not possible without loss of information,
because StarMath is less expressive ; or one will have to extend the
StarMath language with many new constructions.
- LibreOffice MathML claims export/import support for "MathML 1.0" but
the recommendation is now "MathML3".
- As I already reported, HTML5 import/export with embedded MathML would
be great!
- Perhaps the (X)HTML export should have an option to insert a line of
code to load MathJax, when the document contains MathML formulas:
src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=MML_HTMLorMML";>
Do you want an export to Content Markup?
No I'm not interested in a Content MathML export. If I can improve the
Presentation MathML export to at least produce good markup for the
StarMath constructions and so that users stop complaining about issues
with the formulas generated by LibreOffice, then that would be fine to me.
The StarMath code is stored in the element.
Yes, that's what I mean, the / elements
are children of .
Export to PNG already exists but needs improvement.
True. That said, I'm not really a big fan of PNG export for mathematical
formulas ;-)
There are not only the large goals you have outlined, but a lot of
enhancement request, which are open for many years, like arbitrary
colors, storing in Gallery, better integral sign.
The Math module has got very small enhancements in the last years. It
would be really good, if you can help in that area.
I'd like to help but I'm not sure I'll have time to. In the short term,
I just plan to improve MathML export so that LibreOffice users can
publish their math document on the Web, without having to use PNG images
or similar hacks.
Thanks,
--
Frédéric Wang
maths-informatique-jeux.com/blog/frederic
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/globstr.hrc |5 +++-
sc/source/core/data/global.cxx | 20 -
sc/source/ui/src/globstr.src |8 ++
sc/source/ui/view/gridwin5.cxx | 48 +
4 files changed, 66 insertions(+), 15 deletions(-)
New commits:
commit c13daee32de1be4b96d6a948cfca4aa0bdf8c4db
Author: Akash Shetye
Date: Mon May 27 17:37:54 2013 +0530
fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer
Added prefixed of "ctrl+click to open hyperlink" to hlinks depending on the
security setting. Now clicking links behave as in writer.
Change-Id: I87d0fecb6268463cd99478b70eb081ed958976be
Reviewed-on: https://gerrit.libreoffice.org/4051
Signed-off-by: LuboÅ¡ LuÅák
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f9fda26..314f29a 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -678,7 +678,10 @@
#define STR_COPYFROM549
#define STR_COPYERR 550
-#define STR_COUNT 551
+#define STR_CTRLCLICKHYPERLINK 551
+#define STR_CLICKHYPERLINK 552
+
+#define STR_COUNT 553
#endif
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 95084a9..a34b1de 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -925,20 +925,20 @@ void ScGlobal::OpenURL( const String& rURL, const String&
rTarget )
// aufgerufen, darum stimmen pScActiveViewShell und nScClickMouseModifier.
//SvtSecurityOptions to access Libreoffice global security parameters
SvtSecurityOptions aSecOpt;
-bool bProceedHyperlink = false;
-if ( (nScClickMouseModifier & KEY_MOD1) && aSecOpt.IsOptionSet(
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK )) // control-click -> into new
window
+bool bCtrlClickHappened = (nScClickMouseModifier & KEY_MOD1);
+bool bCtrlClickSecOption = aSecOpt.IsOptionSet(
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+if( bCtrlClickHappened && !( bCtrlClickSecOption ) )
{
-//Ctrl key is pressed and ctrl+click hyperlink security control is set
-bProceedHyperlink = true;
+//return since ctrl+click happened when the
+//ctrl+click security option was disabled, link should not open
+return;
}
-else if( !aSecOpt.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK )
)
+else if( !( bCtrlClickHappened ) && bCtrlClickSecOption )
{
-//ctrl+click hyperlink security control is disabled just click will do
-bProceedHyperlink = true;
-}
-if ( !bProceedHyperlink )
+//ctrl+click did not happen; only click happened maybe with some
+//other key combo. and security option is set, so return
return;
-
+}
SfxStringItem aUrl( SID_FILE_NAME, rURL );
SfxStringItem aTarget( SID_TARGETNAME, rTarget );
aTarget.SetValue(OUString("_blank"));
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index af236f9..bd9579c 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2081,6 +2081,14 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "Cells without text have been ignored." ;
};
+String STR_CTRLCLICKHYPERLINK
+{
+Text [ en-US ] = "ctrl+click to open hyperlink:";
+};
+String STR_CLICKHYPERLINK
+{
+Text [ en-US ] = "click to open hyperlink:";
+};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 756f75c..ee357f6 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -31,6 +31,7 @@
#include
#include
+#include
#include "viewuno.hxx"
#include "AccessibleDocument.hxx"
@@ -49,7 +50,8 @@
#include "tabvwsh.hxx"
#include "userdat.hxx"
#include "postit.hxx"
-
+#include "global.hxx"
+#include "globstr.hrc"
// ---
bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard )
@@ -241,16 +243,21 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW
nPosY, bool bKeyboard )
void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
{
+//To know whether to prefix STR_CTRLCLICKHYERLINK or STR_CLICKHYPERLINK
+//to hyperlink tooltips/help text
+SvtSecurityOptions aSecOpt;
+bool bCtrlClickHlink = aSecOpt.IsOptionSet(
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+//Global string STR_CTRLCLICKHYPERLINK i.e, "ctrl+click to open hyperlink:"
+OUString aCtrlClickHlinkStr = ScGlobal::GetRscString(
STR_CTRLCLICKHYPERLINK );
+//Global string STR_CLICKHYPERLINK i.e, "click to open hyperlink"
+OUString aClickHlinkStr = ScGlobal::GetRscString( STR_CLICKHYPERLINK );
sal_Bool bDone = false;
sal_Bool bHelpEnabled = ( rHEvt.GetMode() & ( HELPMODE_BALLOON |
HELPMODE_QUICK ) ) != 0;
SdrView* pDrView = pViewData->G
Re: LO / Firebird DB Integration
On 24/06/13 12:25, David Tardon wrote: > If this is the current option, could we please consider the possibility > to drop the whole idea and just stay with hsqldb? With my distro hat on, > I do not see any improvement with having to bundle hsqldb vs. having to > bundle firebird. The main motivation for the switch was (another step in) getting rid of java (at least for me personally it is, and AFAICS for most other people too), and not the bundling of a db. And there appear to be solutions to allow reliable use of external firebird with various ICUs (see mails from Lionel/Michael) -- so either way firebird still makes the most sense to me. Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2.hxx | 14 ++
basctl/source/basicide/baside2b.cxx | 46 +++-
2 files changed, 54 insertions(+), 6 deletions(-)
New commits:
commit 2274cfb182e1c254b1ecd07d93bad6b421734316
Author: Gergo Mocsi
Date: Mon Jun 24 16:02:24 2013 +0200
GSOC work week 3, showing methods in a ListBox
This patch allows the Code Completition feature to list methods in a custom
ListBox class called CodeCompleteListBox.
So, when the user presses the dot("."), a ListBox appears, and listed the
methods(not just prints on the terminal).
The user can select one from them, and it is put in the source code (after
the dot).
Change-Id: Ie5165e7bdaae1d96bbf40a9b996ca8ebbdb40dea
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index fb48ae3..774995d 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -41,6 +41,7 @@ class SvxSearchItem;
#include
#include
#include
+#include "vcl/lstbox.hxx"
#include
#include
@@ -57,6 +58,7 @@ namespace basctl
{
class ObjectCatalog;
+class CodeCompleteListBox;
DBG_NAMEEX( ModulWindow )
@@ -109,6 +111,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
GetComponentInterface(sal_Bool bCreate = true);
std::vector< CodeCompleteData > aCodeCompleteCache;
+CodeCompleteListBox* aListBox;
protected:
virtual voidPaint( const Rectangle& );
@@ -463,6 +466,17 @@ private:
} aSyntaxColors;
};
+class CodeCompleteListBox: public ListBox
+{
+private:
+EditorWindow* pParent; // parent window
+DECL_LINK(ImplSelectHdl, void*);
+
+public:
+CodeCompleteListBox(EditorWindow* pPar);
+virtual ~CodeCompleteListBox();
+};
+
} // namespace basctl
#endif // BASCTL_BASIDE2_HXX
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index afde040..5d9daf2 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -250,6 +250,7 @@ EditorWindow::EditorWindow (Window* pParent, ModulWindow*
pModulWindow) :
s[0] = OUString( "FontHeight" );
s[1] = OUString( "FontName" );
n->addPropertiesChangeListener(s, listener_.get());
+aListBox = new CodeCompleteListBox(this);
}
@@ -271,6 +272,7 @@ EditorWindow::~EditorWindow()
EndListening( *pEditEngine );
pEditEngine->RemoveView(pEditView.get());
}
+delete aListBox;
}
OUString EditorWindow::GetWordAtCursor()
@@ -507,13 +509,27 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
{
Reference< lang::XMultiServiceFactory > xFactory(
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
Reference< reflection::XIdlReflection > xRefl(
xFactory->createInstance("com.sun.star.reflection.CoreReflection"),
UNO_QUERY_THROW );
-Reference< reflection::XIdlClass > xClass =
xRefl->forName(aCodeCompleteCache[j].sVarType);
-if( !xRefl.is() )
-break;
-Sequence< Reference< reflection::XIdlMethod > > aMethods =
xClass->getMethods();
-for(sal_Int32 i = 0; i < aMethods.getLength(); ++i)
+if( xRefl.is() )
{
-SAL_WARN("method information",aMethods[i]->getName());
+Reference< reflection::XIdlClass > xClass =
xRefl->forName(aCodeCompleteCache[j].sVarType);
+if( xClass != NULL )
+{
+Sequence< Reference< reflection::XIdlMethod > >
aMethods = xClass->getMethods();
+aListBox->Clear();
+for(sal_Int32 i = 0; i < aMethods.getLength(); ++i)
+{
+aListBox->InsertEntry(
OUString(aMethods[i]->getName()) );
+SAL_WARN("method information",
aMethods[i]->getName());
+}
+aListBox->EnableAutoSize(true);
+aListBox->Show();
+aListBox->GetFocus();
+aListBox->ToggleDropDown();
+}
+else
+{
+SAL_WARN("Type does not exist",
aCodeCompleteCache[j].sVarType);
+}
}
break;
}
@@ -2285,6 +2301,24 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped
)
setBasicWatchMode( false );
}
+CodeCompleteListBox::CodeCompleteListBox(EditorWindow* pPar)
+: ListBox(pPar, WB_DROPDOWN),
+pParent(pPar)
+{
+SetSelectHdl( LINK(this, CodeCompleteListBox, ImplSelectHdl) );
+}
+
+CodeCompleteListBox::~CodeCompleteListBox()
+{
+}
+
+IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl)
+{
+TextSelection aSel = this->pParent->GetEditView()->GetSelection();
+pParent->GetEditEngi
Re: SVX ID collision
On Mon, 2013-06-24 at 13:11 +0100, Caolán McNamara wrote: > On Sun, 2013-06-23 at 14:21 +0200, Tomaž Vajngerl wrote: > > Hi, > > > > I noticed we renumbered the ID's in "include/svx/svxids.hrc" but this > > is causing problems for the toolbar/popup menu icon (it is not drawn) > > and functionality for left graphic rotation (SID_ROTATE_GRAPHIC_LEFT > > which is defined as [1]). I noticed that the same ID (SID_SVX_START > > +1121) is added to [2] which is in "include/editeng/editids.hrc". I > > think that this two IDs are colliding in some way because if I change > > the number to something else, rotate left icon is drawn again > > correctly. Now the question is what to do about this.. I could just > > relocate the ID for SID_ROTATE_GRAPHIC_LEFT and be done, but we might > > have more problems because of this. Can someone take a look at this? > > > > I also noticed that SID_SVX_START offset is also used by > > "include/sfx2/sfxsids.hrc" and some more files, which could also cause > > collisions and problems. > > Yeah, its an awesome mess Does 669ad519902e21e0cb3537fb7e203987f75a4077 fix the problem (I'm not entirely sure what buttons I'm supposed to push to find your rotation thing) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig include/editeng include/sfx2 include/svx include/vcl sfx2/uiconfig vcl/source
cui/uiconfig/ui/pastespecial.ui |1 + include/editeng/editids.hrc | 15 ++- include/sfx2/sfxsids.hrc |4 include/svx/svxids.hrc |3 +++ include/vcl/edit.hxx |3 +++ sfx2/uiconfig/ui/documentinfopage.ui |2 ++ vcl/source/control/edit.cxx | 21 - 7 files changed, 43 insertions(+), 6 deletions(-) New commits: commit 669ad519902e21e0cb3537fb7e203987f75a4077 Author: Caolán McNamara Date: Mon Jun 24 14:40:07 2013 +0100 colliding SID_SVX_START based ids Change-Id: I6eba0b0c2291a71ebe683b23a0af400010d5b5d8 diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index 7dbaae8..e6c67c6 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -21,6 +21,12 @@ #include +/* + These SID_SVX_START entries came from include/svx/svxids.hrc, avoid + accidentally colliding entries with include/svx/svxids.hrc and + include/sfx2/sfxsids.hrc. Only add new SID_SVX_START entries to + include/svx/svxids.hrc +*/ #define SID_ATTR_BRUSH ( SID_SVX_START + 1 ) #define SID_ATTR_TABSTOP( SID_SVX_START + 2 ) #define SID_ATTR_TABSTOP_DEFAULTS ( SID_SVX_START + 3 ) @@ -112,17 +118,16 @@ #define SID_ATTR_CHAR_LATIN_LANGUAGE( SID_SVX_START + 996 ) #define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 ) #define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 ) -#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_SVX_START + 1121 ) -#define SID_ATTR_CHAR_PREVIEW_FONT ( SID_SVX_START + 1122 ) -#define SID_ATTR_CHAR_ENDPREVIEW_FONT ( SID_SVX_START + 1123 ) - -// this ID didn't exist prior to the svx split +// these ID didn't exist prior to the svx split, add new ids here #define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 ) #define SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD ( SID_EDIT_START + 69 ) #define SID_ATTR_ALIGN_VER_JUSTIFY_METHOD ( SID_EDIT_START + 70 ) #define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_EDIT_START + 71 ) #define SID_ATTR_ALIGN_VER_JUSTIFY ( SID_EDIT_START + 72 ) +#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_EDIT_START + 73 ) +#define SID_ATTR_CHAR_PREVIEW_FONT ( SID_EDIT_START + 74 ) +#define SID_ATTR_CHAR_ENDPREVIEW_FONT ( SID_EDIT_START + 75 ) /* // planned, but not doable: changing value of SIDs will break code that uses them for WhichRanges diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index fcfe4dd..d1227e3 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -583,6 +583,10 @@ #define SID_HELP_STYLESHEET (SID_OPTIONS_START + 99) // slot IDs from SVX (svxids.hrc) - +// These SID_SVX_START entries came from include/svx/svxids.hrc, avoid +// accidentally colliding entries with include/svx/svxids.hrc and +// include/editeng/editids.hrc. Only add new SID_SVX_START entries +// to include/svx/svxids.hrc #define SID_ZOOM_TOOLBOX(SID_SVX_START + 96) #define SID_ZOOM_OUT(SID_SVX_START + 97) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 7a62e63..8aa8807 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -269,6 +269,9 @@ // -- // Svx-Id's +// When adding new entries here, note that other SID_SVX_START entries exist in +// include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the +// same id for two different attributes // -- #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) commit 9495e912797f67897a4a658d20137bb94f39e9ab Author: Caolán McNamara Date: Mon Jun 24 12:42:39 2013 +0100 Resolves: fdo#66105 set max growth width for labels/edits which take paths Change-Id: I12220821f76550baacdc8ce604f2e612d260c1a1 diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui index fb08b9e..3eb4e7d 100644 --- a/cui/uiconfig/ui/pastespecial.ui +++ b/cui/uiconfig/ui/pastespecial.ui @@ -97,6 +97,7 @@ True False True +72 False diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 11c1ae8..6df1f7b 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -71,6 +71,7 @@ private: sal_uInt16 mnAlign; xub_StrLen mnMaxTextLen; sal_Int32 mnWidthInChars; +sal_Int32 mnMaxWidthChars;
Compilation problem, pnglibconf.h exists but not detected ?
Hi, When building LibreOffice on my RHEL6 system, it successfully passed configure, however after lots of compiling I still get: CC cairo-png.lo In file included from cairo-png.c:46: /home/dag/home-made/libreoffice/workdir/unxlngx6.pro/UnpackedTarball/png/png.h:434:27: error: pnglibconf.h: No such file or directory cairo-png.c: In function ‘write_png’: cairo-png.c:248: error: implicit declaration of function ‘png_set_packswap’ cairo-png.c:248: warning: nested extern declaration of ‘png_set_packswap’ cairo-png.c:268: error: implicit declaration of function ‘png_set_bKGD’ cairo-png.c:268: warning: nested extern declaration of ‘png_set_bKGD’ cairo-png.c:273: error: implicit declaration of function ‘png_convert_from_time_t’ cairo-png.c:273: warning: nested extern declaration of ‘png_convert_from_time_t’ cairo-png.c:274: error: implicit declaration of function ‘png_set_tIME’ cairo-png.c:274: warning: nested extern declaration of ‘png_set_tIME’ cairo-png.c:284: error: implicit declaration of function ‘png_set_write_user_transform_fn’ cairo-png.c:284: warning: nested extern declaration of ‘png_set_write_user_transform_fn’ cairo-png.c:287: error: implicit declaration of function ‘png_set_filler’ cairo-png.c:287: warning: nested extern declaration of ‘png_set_filler’ cairo-png.c:287: error: ‘PNG_FILLER_AFTER’ undeclared (first use in this function) cairo-png.c:287: error: (Each undeclared identifier is reported only once cairo-png.c:287: error: for each function it appears in.) cairo-png.c: In function ‘stdio_write_func’: cairo-png.c:319: error: implicit declaration of function ‘png_error’ cairo-png.c:319: warning: nested extern declaration of ‘png_error’ cairo-png.c: In function ‘read_png’: cairo-png.c:562: error: implicit declaration of function ‘png_read_info’ cairo-png.c:562: warning: nested extern declaration of ‘png_read_info’ cairo-png.c:574: error: implicit declaration of function ‘png_set_palette_to_rgb’ cairo-png.c:574: warning: nested extern declaration of ‘png_set_palette_to_rgb’ cairo-png.c:579: error: implicit declaration of function ‘png_set_expand_gray_1_2_4_to_8’ cairo-png.c:579: warning: nested extern declaration of ‘png_set_expand_gray_1_2_4_to_8’ cairo-png.c:587: error: implicit declaration of function ‘png_set_tRNS_to_alpha’ cairo-png.c:587: warning: nested extern declaration of ‘png_set_tRNS_to_alpha’cairo-png.c:590: error: implicit declaration of function ‘png_set_strip_16’ cairo-png.c:590: warning: nested extern declaration of ‘png_set_strip_16’ cairo-png.c:593: error: implicit declaration of function ‘png_set_packing’ cairo-png.c:593: warning: nested extern declaration of ‘png_set_packing’ cairo-png.c:599: error: implicit declaration of function ‘png_set_gray_to_rgb’ cairo-png.c:599: warning: nested extern declaration of ‘png_set_gray_to_rgb’ cairo-png.c:603: error: implicit declaration of function ‘png_set_interlace_handling’ cairo-png.c:603: warning: nested extern declaration of ‘png_set_interlace_handling’ cairo-png.c:605: error: ‘PNG_FILLER_AFTER’ undeclared (first use in this function) cairo-png.c:627: error: implicit declaration of function ‘png_set_read_user_transform_fn’ cairo-png.c:627: warning: nested extern declaration of ‘png_set_read_user_transform_fn’ cairo-png.c:657: error: implicit declaration of function ‘png_read_image’ cairo-png.c:657: warning: nested extern declaration of ‘png_read_image’ cairo-png.c:658: error: implicit declaration of function ‘png_read_end’ cairo-png.c:658: warning: nested extern declaration of ‘png_read_end’ make[3]: *** [cairo-png.lo] Error 1 make[2]: *** [all] Error 2 make[1]: *** [/home/dag/home-made/libreoffice/workdir/unxlngx6.pro/ExternalProject/cairo/build] Error 1 make: *** [build] Error 2 Even when pnglibconf.h exists in the tree: [dag@moria libreoffice]$ find . -name pnglibconf.h ./libpng/configs/pnglibconf.h Known problem ? -- -- dag wieers, d...@wieers.com, http://dag.wieers.com/ -- dagit linux solutions, cont...@dagit.net, http://dagit.net/ [Any errors in spelling, tact or fact are transmission errors]___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svl/source
svl/source/misc/urihelper.cxx |2 +-
svl/source/numbers/zforlist.cxx |6 +++---
svl/source/numbers/zformat.cxx |4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 97f71c5f8be85f47d7978259a2d82708412043fd
Author: Jelle van der Waa
Date: Sat Jun 22 12:51:51 2013 +0200
fdo#43460 svl: use isEmpty()
Change-Id: I441842c7514a27baea8ce5c0e7381dcf81892d6a
Reviewed-on: https://gerrit.libreoffice.org/4441
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 6642cd1..61b3a02 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -235,7 +235,7 @@ OUString normalize(
if (preCount != i) {
if (preCount == i - 1) {
buf.append(static_cast< sal_Unicode >('/'));
-} else if (preCount - 1 == i && buf.getLength() > 0
+} else if (preCount - 1 == i && !buf.isEmpty()
&& buf[buf.getLength() - 1] == '/')
{
buf.setLength(buf.getLength() - 1);
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 99c3da2..abfe9c9 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -997,7 +997,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType
eLnge, bool bNoAdditio
aDupes.append( ") ");
}
}
-if ( aDupes.getLength() > 0 )
+if ( !aDupes.isEmpty() )
{
OUStringBuffer aMsg(aDupes.getLength() +
xSeq[j].formatKey.getLength() + 100);
aMsg.append("XML locale data FormatElement formatindex
dupe: ");
@@ -2158,7 +2158,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
break;
}
}
-if (aMsg.getLength())
+if (!aMsg.isEmpty())
{
aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault:
");
aMsg.append("\nXML locale data FormatElement formatindex: ");
@@ -2174,7 +2174,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
aMsg.append("no medium type default ");
if ( nLong != -1 && nLongDef == -1 )
aMsg.append("no long type default ");
-if (aMsg.getLength())
+if (!aMsg.isEmpty())
{
aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault: ");
aMsg.append("\nXML locale data FormatElement group of: ");
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 4ffa3ce..720ea87 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1356,7 +1356,7 @@ OUString SvNumberformat::LocaleType::generateCode() const
{
sal_uInt8 n = static_cast((n16 & 0xF000) >> 12);
// Omit leading zeros for consistency.
-if (n || aBuf.getLength() || i == 3)
+if (n || !aBuf.isEmpty() || i == 3)
{
aBuf.append(toUniChar(n));
}
@@ -4306,7 +4306,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
}
sStr.remove( nPoint, 1 ); // Remove .
}
-if (bSign && (sStr.getLength() == 0 ||
+if (bSign && (sStr.isEmpty() ||
comphelper::string::getTokenCount(sStr.toString(), '0')
== sStr.getLength()+1)) // Only 0
{
bSign = false; // Not -0.00
___
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' - connectivity/source
connectivity/source/commontools/TTableHelper.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 002c79346c69c0b7f4953daec7377e71660ae306
Author: Lionel Elie Mamane
Date: Fri Jun 21 15:24:15 2013 +0200
fdo#49708 when there is no Primary Key, there is no Primay Key
As opposed to a primary key with empty name and no columns (!)
Change-Id: I78ca185947a0e8d37bac64bd50add155afaeed47
Reviewed-on: https://gerrit.libreoffice.org/4431
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index 8442a26..3e29b7b 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -339,12 +339,19 @@ void OTableHelper::refreshPrimaryKeys(TStringVector&
_rNames)
if ( !bAlreadyFetched )
{
aPkName = xRow->getString(6);
+SAL_WARN_IF(xRow->wasNull(),"connectivity.commontools", "NULL
Primary Key name");
+SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools",
"empty Primary Key name");
bAlreadyFetched = true;
}
}
-m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
-_rNames.push_back(aPkName);
+if(bAlreadyFetched)
+{
+SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools", "empty
Primary Key name");
+SAL_WARN_IF(pKeyProps->m_aKeyColumnNames.size() ==
0,"connectivity.commontools", "Primary Key has no columns");
+m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
+_rNames.push_back(aPkName);
+}
} // if ( xResult.is() && xResult->next() )
::comphelper::disposeComponent(xResult);
}
___
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' - include/vcl vcl/source
include/vcl/vclmedit.hxx |2 ++
vcl/source/edit/vclmedit.cxx | 12
vcl/source/window/layout.cxx |2 ++
3 files changed, 16 insertions(+)
New commits:
commit bf69b76ee8e16069ca6d6a1782e7610ef784aa4b
Author: Caolán McNamara
Date: Tue Jun 4 16:13:06 2013 +0100
Related: fdo#66105 clip message box dialogs to some reasonable widths
(cherry picked from commit 19a2685ec04bd6ce882d4dd08d24c7248cf99a84)
Change-Id: I7fc179865306ba5b593b090b1fdb8971ba6bd508
Reviewed-on: https://gerrit.libreoffice.org/4480
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 63caa3b..e3fdfc5 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -81,6 +81,8 @@ public:
virtual voidSetMaxTextLen( xub_StrLen nMaxLen = 0 );
virtual xub_StrLen GetMaxTextLen() const;
+voidSetMaxTextWidth( sal_uLong nMaxWidth );
+
virtual voidSetSelection( const Selection& rSelection );
virtual const Selection& GetSelection() const;
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index b83be1d..79d8399 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -115,6 +115,8 @@ public:
voidSetMaxTextLen( xub_StrLen nLen );
xub_StrLen GetMaxTextLen() const;
+voidSetMaxTextWidth( sal_uLong nMaxWidth );
+
sal_BoolIsInsertMode() const;
voidInsertText( const String& rStr );
@@ -400,6 +402,11 @@ String ImpVclMEdit::GetSelected( LineEnd aSeparator ) const
return mpTextWindow->GetTextView()->GetSelected( aSeparator );
}
+void ImpVclMEdit::SetMaxTextWidth( sal_uLong nMaxWidth )
+{
+mpTextWindow->GetTextEngine()->SetMaxTextWidth( nMaxWidth );
+}
+
void ImpVclMEdit::Resize()
{
size_t nIteration = 1;
@@ -1113,6 +1120,11 @@ void VclMultiLineEdit::SetMaxTextLen( xub_StrLen nMaxLen
)
pImpVclMEdit->SetMaxTextLen( nMaxLen );
}
+void VclMultiLineEdit::SetMaxTextWidth( sal_uLong nMaxWidth )
+{
+pImpVclMEdit->SetMaxTextWidth(nMaxWidth );
+}
+
xub_StrLen VclMultiLineEdit::GetMaxTextLen() const
{
return pImpVclMEdit->GetMaxTextLen();
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 4714f1e..33977c2 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1783,6 +1783,7 @@ short MessageDialog::Execute()
m_pPrimaryMessage->set_hexpand(true);
m_pPrimaryMessage->SetText(m_sPrimaryString);
m_pPrimaryMessage->Show(!m_sPrimaryString.isEmpty());
+
m_pPrimaryMessage->SetMaxTextWidth(m_pPrimaryMessage->approximate_char_width()
* 60);
m_pSecondaryMessage = new VclMultiLineEdit(m_pGrid, nWinStyle);
m_pSecondaryMessage->SetPaintTransparent(true);
@@ -1792,6 +1793,7 @@ short MessageDialog::Execute()
m_pSecondaryMessage->set_hexpand(true);
m_pSecondaryMessage->SetText(m_sSecondaryString);
m_pSecondaryMessage->Show(!m_sSecondaryString.isEmpty());
+
m_pSecondaryMessage->SetMaxTextWidth(m_pPrimaryMessage->approximate_char_width()
* 80);
m_pGrid->Show();
___
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' - forms/source
forms/source/component/ListBox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6fd7c667db057571ce1fa9c2fbc4a78161227f5a Author: Lionel Elie Mamane Date: Sun Jun 23 17:56:09 2013 +0200 Don't second-guess the database If it gives us a NULL as bound value, use it, even if the underlying column has constraint NOT NULL. This can happen e.g. in OUTER JOIN, with UNION, ... Change-Id: I1fc0d9366764b90e0cdb443cd34c32b52f059e0b Reviewed-on: https://gerrit.libreoffice.org/4462 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 14a67b9..d4e46eb 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -916,7 +916,7 @@ namespace frm aBoundValue = static_cast(xListCursor->getRow()-1); aValueList.push_back( aBoundValue ); -if ( bUseNULL && ( m_nNULLPos == -1 ) && aBoundValue.isNull() ) +if ( m_nNULLPos == -1 && aBoundValue.isNull() ) m_nNULLPos = sal_Int16( aDisplayList.size() - 1 ); if ( bUseNULL && ( m_nNULLPos == -1 ) && aStr.isEmpty() ) // There is already a non-NULL entry with empty display string; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/n823655.rtf | 48
sw/qa/extras/rtfimport/rtfimport.cxx| 26 +++
writerfilter/source/rtftok/rtfsdrimport.cxx | 14
3 files changed, 81 insertions(+), 7 deletions(-)
New commits:
commit fe8d6ffa05c467bddb3480e43d7043a3d3c9
Author: Miklos Vajna
Date: Mon Jun 24 14:13:39 2013 +0200
bnc#823655 fix RTF import of freeform shape coordinates
E.g. 0,1 was imported as 1,0, as we did not differentiate between not
having the coordinate yet and having it as zero.
Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4
diff --git a/sw/qa/extras/rtfimport/data/n823655.rtf
b/sw/qa/extras/rtfimport/data/n823655.rtf
new file mode 100644
index 000..94e73ed
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n823655.rtf
@@ -0,0 +1,48 @@
+{\rtf1
+foo
+{\shp
+{\*\shpinst\shpleft450\shptop1904\shpright11595\shpbottom2190\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz0\shplid1026
+{\sp
+{\sn shapeType}
+{\sv 0}
+}
+{\sp
+{\sn fFlipH}
+{\sv 0}
+}
+{\sp
+{\sn fFlipV}
+{\sv 0}
+}
+{\sp
+{\sn geoRight}
+{\sv 11145}
+}
+{\sp
+{\sn geoBottom}
+{\sv 286}
+}
+{\sp
+{\sn pVerticies}
+{\sv 8;4;(0,286);(11145,286);(11145,1);(0,1)}
+}
+{\sp
+{\sn pSegmentInfo}
+{\sv 2;5;16384;1;1;1;32768}
+}
+{\sp
+{\sn fFillOK}
+{\sv 1}
+}
+{\sp
+{\sn fillColor}
+{\sv 15000804}
+}
+{\sp
+{\sn fFilled}
+{\sv 1}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c84cb81..53be3b2 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -8,6 +8,7 @@
#include
#include
+#include
#include
#include
#include
@@ -144,6 +145,7 @@ public:
void testPoshPosv();
void testN825305();
void testParaBottomMargin();
+void testN823655();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -275,6 +277,7 @@ void Test::run()
{"posh-posv.rtf", &Test::testPoshPosv},
{"n825305.rtf", &Test::testN825305},
{"para-bottom-margin.rtf", &Test::testParaBottomMargin},
+{"n823655.rtf", &Test::testN823655},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1306,6 +1309,29 @@ void Test::testParaBottomMargin()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(getParagraph(1),
"ParaBottomMargin"));
}
+void Test::testN823655()
+{
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Sequence aProps = getProperty<
uno::Sequence >(xDraws->getByIndex(0),
"CustomShapeGeometry");
+uno::Sequence aPathProps;
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+if (rProp.Name == "Path")
+aPathProps = rProp.Value.get< uno::Sequence
>();
+}
+uno::Sequence aCoordinates;
+for (int i = 0; i < aPathProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aPathProps[i];
+if (rProp.Name == "Coordinates")
+aCoordinates = rProp.Value.get<
uno::Sequence >();
+}
+// The first coordinate pair of this freeform shape was 286,0 instead of
0,286.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(286),
aCoordinates[0].Second.Value.get());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 1b62df3..6cac9c1 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -317,19 +317,19 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose)
// The coordinates are in an (x,y) form.
aToken = aToken.copy(1, aToken.getLength() - 2);
sal_Int32 nI = 0;
-sal_Int32 nX = 0;
-sal_Int32 nY = 0;
+boost::optional oX;
+boost::optional oY;
do
{
OUString aPoint = aToken.getToken(0, ',', nI);
-if (!nX)
-nX = aPoint.toInt32();
+if (!oX)
+oX.reset(aPoint.toInt32());
else
-nY = aPoint.toInt32();
+oY.reset(aPoint.toInt32());
}
while (nI >= 0);
-aCoordinates[nIndex].First.Value <<= nX;
-aCoordinates[nIndex].Second.Value <<= nY;
+aCoordinates[nIndex].First.Value <<= *oX;
+aCoordinates[nIndex].Second.Value <<= *oY;
nIndex++;
}
}
___
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - forms/source
forms/source/component/ListBox.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 51c833591bc0959b537199abd174a7dfa7e6e601 Author: Lionel Elie Mamane Date: Sun Jun 23 17:32:20 2013 +0200 Data-aware ListBox: use entry for NULL if the *bound* value is NULL as opposed to when the display string is empty. Change-Id: I802955404d2d8d5c91b3fd1633e34be7ef4f0b82 Reviewed-on: https://gerrit.libreoffice.org/4461 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 68ca37e..14a67b9 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -916,8 +916,13 @@ namespace frm aBoundValue = static_cast(xListCursor->getRow()-1); aValueList.push_back( aBoundValue ); -if ( bUseNULL && ( m_nNULLPos == -1 ) && aStr.isEmpty() ) +if ( bUseNULL && ( m_nNULLPos == -1 ) && aBoundValue.isNull() ) m_nNULLPos = sal_Int16( aDisplayList.size() - 1 ); +if ( bUseNULL && ( m_nNULLPos == -1 ) && aStr.isEmpty() ) +// There is already a non-NULL entry with empty display string; +// adding another one for NULL would make things confusing, +// so back off. +bUseNULL = false; } } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement
All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - forms/source
forms/source/component/ListBox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9cca4617c4e020e5562b5023030da7418af67f55 Author: Lionel Elie Mamane Date: Sun Jun 23 17:28:58 2013 +0200 Use unsigned values in m_a(Converted)BoundValues Values that come from the database are always signed (we inherit that from sdbc that inherits that from jdbc that inherits that from Java's type system that does not have unsigned values) So when using unsigned values, they always operator==-compare false! Change-Id: I604b04afa23ede835c1f3db1f8c1bdeafbfba7ea Reviewed-on: https://gerrit.libreoffice.org/4460 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index ee7c327..68ca37e 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -913,7 +913,7 @@ namespace frm aBoundValue.fill( *aBoundColumn + 1, m_nBoundColumnType, xCursorRow ); else // -1 because getRow() is 1-indexed, but ListBox positions are 0-indexed -aBoundValue = static_cast(xListCursor->getRow()-1); +aBoundValue = static_cast(xListCursor->getRow()-1); aValueList.push_back( aBoundValue ); if ( bUseNULL && ( m_nNULLPos == -1 ) && aStr.isEmpty() ) ___ 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' - accessibility/source
accessibility/source/standard/vclxaccessibletabpagewindow.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit c95f654ed26a8b640fd678b9bd1514384ad27c80
Author: Michael Stahl
Date: Thu Jun 20 16:29:14 2013 +0200
VCLXAccessibleTabPageWindow: unhandled IndexOutOfBoundsException
... due to GetPagePos returning -1, work around that (can be easily
triggered in template manager).
Change-Id: Ic1334b224730d79e533539a24f115dc9aa2e9570
(cherry picked from commit 35b45e6915eecfea0e21525249eabe3afd39d09e)
Reviewed-on: https://gerrit.libreoffice.org/4398
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 3865832..f63e266 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -114,7 +114,15 @@ Reference< XAccessible >
VCLXAccessibleTabPageWindow::getAccessibleParent( ) th
{
Reference< XAccessibleContext > xCont(
xAcc->getAccessibleContext() );
if ( xCont.is() )
-xParent = xCont->getAccessibleChild(
m_pTabControl->GetPagePos( m_nPageId ) );
+{
+sal_uInt16 const
nPagePos(m_pTabControl->GetPagePos(m_nPageId));
+SAL_WARN_IF(TAB_PAGE_NOTFOUND == nPagePos, "accessibility",
+"getAccessibleParent(): no tab page");
+if (TAB_PAGE_NOTFOUND != nPagePos)
+{
+xParent = xCont->getAccessibleChild(nPagePos);
+}
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Converting Tab Stops paragraph tab page
On Sat, 2013-06-22 at 18:02 -0300, Olivier Hallot wrote:
> Hi Caolán, all,
>
> 1)On converting Paragraph Tab Stop page (Format - Paragraph - Tabs) I
> get a MetricBox to display the tab position inserted by user.
>
> MetricBox ED_TABPOS
> {
> HelpID = "cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS";
> Pos = MAP_APPFONT ( 12 , 14 ) ;
> Size = MAP_APPFONT ( 39 , 165 ) ;
> Minimum = -5600 ;
> Maximum = 5600 ;
> DecimalDigits = 2 ;
> Unit = FUNIT_CM ;
> };
>
> Based on the wiki widget conversion page I tried a GtkComboBox as
> indicated. Is there a specific setting for the GtkComboBox to mimick the
> MetricBox (e.g. permanently open) as displayed in the old way?
> Otherwise, what widget should I use? Source files at
I wonder if we could just use a MetricField (rather than a MetricBox)
here instead. That was we already have the option of putting "-nospin"
at the end of the name to hide the up/down spin buttons. You would have
to change the code from MetricBox to MetricField in that case.
>
> cui/source/tabpages/tabstpge.*
>
> 2) The tab symbols on the right of the Types radiobuttons seems to be
> static. Is that true? (I can't check in CJK or RTL languages). If
> affirmative, what about replacing the class that draws them by a static
> image?
Well, they are "fairly" static. The current code uses Ruler::DrawTab to
draw the image, the advantage of keeping things as they are is that the
code could be taught to scale them to fit whatever size fairly easily.
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/fmcomp/fmgridcl.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 748a011c3c1bdcc7b2f45ed64342c3e299ca61a9
Author: Michael Stahl
Date: Thu Jun 20 15:02:37 2013 +0200
FmGridControl: handle non-existing properties
Fix crash with unhandled exception requesting "Description".
Change-Id: I6b6cb61273fb042532ab63620729f4129239fe81
(cherry picked from commit 32e2c6456fb3bf3bf75f9b11c90193c537b4ef26)
Reviewed-on: https://gerrit.libreoffice.org/4397
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index a864db3..374af64 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1908,7 +1908,14 @@ namespace
Reference xProp;
xIndex->getByIndex( _nPosition ) >>= xProp;
if ( xProp.is() )
-xProp->getPropertyValue( _sPropName ) >>= sRetText;
+{
+try {
+xProp->getPropertyValue( _sPropName ) >>= sRetText;
+} catch (UnknownPropertyException const& e) {
+SAL_WARN("svx.form",
+"exception caught: " << e.Message);
+}
+}
}
}
return sRetText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - accessibility/source
accessibility/source/standard/vclxaccessibletabpagewindow.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit d4f3a3dc266ec299153058fa002857e4c242763b
Author: Michael Stahl
Date: Thu Jun 20 16:29:14 2013 +0200
VCLXAccessibleTabPageWindow: unhandled IndexOutOfBoundsException
... due to GetPagePos returning -1, work around that (can be easily
triggered in template manager).
Change-Id: Ic1334b224730d79e533539a24f115dc9aa2e9570
(cherry picked from commit 35b45e6915eecfea0e21525249eabe3afd39d09e)
Reviewed-on: https://gerrit.libreoffice.org/4400
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 03aac5a..28383f3 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -112,7 +112,15 @@ Reference< XAccessible >
VCLXAccessibleTabPageWindow::getAccessibleParent( ) th
{
Reference< XAccessibleContext > xCont(
xAcc->getAccessibleContext() );
if ( xCont.is() )
-xParent = xCont->getAccessibleChild(
m_pTabControl->GetPagePos( m_nPageId ) );
+{
+sal_uInt16 const
nPagePos(m_pTabControl->GetPagePos(m_nPageId));
+SAL_WARN_IF(TAB_PAGE_NOTFOUND == nPagePos, "accessibility",
+"getAccessibleParent(): no tab page");
+if (TAB_PAGE_NOTFOUND != nPagePos)
+{
+xParent = xCont->getAccessibleChild(nPagePos);
+}
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/fmcomp/fmgridcl.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit e58f2c9ffa627df299cdc5cbddaeaf2f173736c2
Author: Michael Stahl
Date: Thu Jun 20 15:02:37 2013 +0200
FmGridControl: handle non-existing properties
Fix crash with unhandled exception requesting "Description".
Change-Id: I6b6cb61273fb042532ab63620729f4129239fe81
(cherry picked from commit 32e2c6456fb3bf3bf75f9b11c90193c537b4ef26)
Reviewed-on: https://gerrit.libreoffice.org/4399
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 26eacd9..ab8334a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1908,7 +1908,14 @@ namespace
Reference xProp;
xIndex->getByIndex( _nPosition ) >>= xProp;
if ( xProp.is() )
-xProp->getPropertyValue( _sPropName ) >>= sRetText;
+{
+try {
+xProp->getPropertyValue( _sPropName ) >>= sRetText;
+} catch (UnknownPropertyException const& e) {
+SAL_WARN("svx.form",
+"exception caught: " << e.Message);
+}
+}
}
}
return sRetText;
___
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' - xmloff/source
xmloff/source/draw/sdxmlexp.cxx | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 411bd0b8a7184720c2bcbcf468c98fd7158481b3
Author: Caolán McNamara
Date: Sun Jun 23 20:46:07 2013 +0100
Resolves: rhbz#976304 gallery elements may not support document.Settings
so the createInstance throws, so the element doesn't get inserted into
the documents.
regression since f0cd6fe9075cd0aa00162474784ad804a07ed138
Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
(cherry picked from commit fd240ba81b317a54fc4512aaec33650cd7a30e29)
Reviewed-on: https://gerrit.libreoffice.org/4466
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 6e86da3..c9149b9 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2915,15 +2915,16 @@ XMLFontAutoStylePool*
SdXMLExport::CreateFontAutoStylePool()
Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
if( xFac.is() )
{
-Reference const xProps( xFac->createInstance(
- "com.sun.star.document.Settings"), UNO_QUERY );
-if (xProps.is())
+try
{
-try // clipboard document doesn't have shell so throws here
-{
-xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
-}
-catch (uno::Exception const&) { }
+Reference const xProps(
xFac->createInstance(
+ "com.sun.star.document.Settings"),
UNO_QUERY_THROW );
+xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
+}
+catch (...)
+{
+// clipboard document doesn't have shell so throws from
getPropertyValue
+// gallery elements may not support
com.sun.star.document.Settings so throws from createInstance
}
}
}
___
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' - sc/source
sc/source/ui/inc/formula.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit a078353850bc6934a46ad8e0249fbadf35dfe0b2
Author: Julien Nabet
Date: Sun Jun 2 22:29:24 2013 +0200
clang, -Wunused-private-field
Change-Id: I8aa3d67c50a7b248cfdefb9a3152afd259b8ebbd
(cherry picked from commit ac1cb18b82bbee3a2a54ce73480fdb3e2cbf4ab4)
Reviewed-on: https://gerrit.libreoffice.org/4475
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 997e198..2082bc9 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -48,7 +48,6 @@ class ScFormulaDlg : public formula::FormulaDlg,
public IAnyRefDialog
{
ScFormulaReferenceHelper m_aHelper;
-ScFormulaCell* pCell;
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser>
m_xParser;
::com::sun::star::uno::Reference<
::com::sun::star::sheet::XFormulaOpCodeMapper>m_xOpCodeMapper;
___
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' - officecfg/Configuration_officecfg.mk
officecfg/Configuration_officecfg.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df051cddbcc24b5db62f202e8c01f01473bd9fab Author: Andras Timar Date: Sun Jun 23 22:31:36 2013 +0200 ExtendedColorScheme.xcu is localizable Change-Id: I566f50761478b9e18a47a460834258902a905b82 Reviewed-on: https://gerrit.libreoffice.org/4467 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index dc8a77c..8957977 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/Calc.xcu \ org/openoffice/Office/Canvas.xcu \ org/openoffice/Office/Compatibility.xcu \ - org/openoffice/Office/ExtendedColorScheme.xcu \ org/openoffice/Office/ExtensionDependencies.xcu \ org/openoffice/Office/ExtensionManager.xcu \ org/openoffice/Office/Impress.xcu \ @@ -143,6 +142,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/TableWizard.xcu \ org/openoffice/Office/UI.xcu \ org/openoffice/Office/Embedding.xcu \ + org/openoffice/Office/ExtendedColorScheme.xcu \ org/openoffice/Office/WebWizard.xcu \ org/openoffice/Office/FormWizard.xcu \ org/openoffice/Office/Writer.xcu \ ___ 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' - xmlhelp/source
xmlhelp/source/treeview/tvread.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 7ed79c4a3b35a016be6c3d540725512eaf2e0bba
Author: Michael Stahl
Date: Wed Jun 5 21:27:07 2013 +0200
xmlhelp: fix reading symlinked .tree files
Apparently the .tree files nowadays are symlinked, which was not the
case on the libreoffice-4-0 branch... and on viewing the Contents tab
it's evident we can't actually read symlinked .tree files, and crash
with an STL assert because the children vector is empty.
Change-Id: I5a543ef85b827e194120530a486cf19a76837d87
(cherry picked from commit 3ddf70dc1129e9b2294b582256c657305bbf3b3e)
Reviewed-on: https://gerrit.libreoffice.org/4479
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/xmlhelp/source/treeview/tvread.cxx
b/xmlhelp/source/treeview/tvread.cxx
index 83ebfd7..01ef477 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -545,6 +545,11 @@ TVChildTarget::~TVChildTarget()
void TVChildTarget::Check(TVDom* tvDom)
{
+if (tvDom->children.empty())
+{
+return;
+}
+
unsigned i = 0;
bool h = false;
@@ -807,7 +812,8 @@ ConfigData TVChildTarget::init( const Reference<
XMultiServiceFactory >& xSMgr )
}
osl::Directory aDirectory( url );
-osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileSize | osl_FileStatus_Mask_FileURL );
+osl::FileStatus aFileStatus(
+osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_FileURL );
if( osl::Directory::E_None == aDirectory.open() )
{
int idx_ = 0;
@@ -831,18 +837,17 @@ ConfigData TVChildTarget::init( const Reference<
XMultiServiceFactory >& xSMgr )
( str[idx_ + 3] == 'e' || str[idx_ + 3] == 'E' )&&
( str[idx_ + 4] == 'e' || str[idx_ + 4] == 'E' ) )
{
-OSL_ENSURE( aFileStatus.isValid( osl_FileStatus_Mask_FileSize
),
-"invalid file size" );
-
OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
if(! showBasic && baseName.compareToAscii("sbasic") == 0 )
continue;
osl::File aFile( aFileUrl );
if( osl::FileBase::E_None == aFile.open(
osl_File_OpenFlag_Read ) )
{
+// use the file size, not aFileStatus size, in case the
+// tree file is a symlink
sal_uInt64 nSize;
aFile.getSize( nSize );
-configData.vFileLen.push_back( aFileStatus.getFileSize() );
+configData.vFileLen.push_back( nSize );
configData.vFileURL.push_back( aFileUrl );
aFile.close();
}
___
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/ui/uiview/view0.cxx | 260 +-
1 file changed, 132 insertions(+), 128 deletions(-)
New commits:
commit 5ac84ff884b491df4631d78b3c4ba74eddb0b1a5
Author: Norbert Thiebaud
Date: Thu Jun 20 14:03:38 2013 -0500
coverity#705766 Resource leak
Change-Id: I14ca19f33dd57ed1a4a52a8a02f213bada79c20c
Reviewed-on: https://gerrit.libreoffice.org/4409
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 891680d..bcb06f6 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -360,177 +360,181 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
switch ( nSlot )
{
-case FN_VIEW_GRAPHIC:
-
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt->IsGraphic();
-pOpt->SetGraphic( bFlag );
-break;
+case FN_VIEW_GRAPHIC:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt->IsGraphic();
+pOpt->SetGraphic( bFlag );
+break;
-case FN_VIEW_FIELDS:
-if( STATE_TOGGLE == eState )
-bFlag = !SwViewOption::IsFieldShadings() ;
-SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bFlag,
sal_True );
-break;
+case FN_VIEW_FIELDS:
+if( STATE_TOGGLE == eState )
+bFlag = !SwViewOption::IsFieldShadings() ;
+SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bFlag,
sal_True );
+break;
-case FN_VIEW_BOUNDS:
-if( STATE_TOGGLE == eState )
-bFlag = !SwViewOption::IsDocBoundaries();
-SwViewOption::SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bFlag,
sal_True );
-break;
+case FN_VIEW_BOUNDS:
+if( STATE_TOGGLE == eState )
+bFlag = !SwViewOption::IsDocBoundaries();
+SwViewOption::SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bFlag,
sal_True );
+break;
-case SID_GRID_VISIBLE:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt->IsGridVisible();
+case SID_GRID_VISIBLE:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt->IsGridVisible();
-pOpt->SetGridVisible( bFlag );
-break;
+pOpt->SetGridVisible( bFlag );
+break;
-case SID_GRID_USE:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt->IsSnap();
+case SID_GRID_USE:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt->IsSnap();
-pOpt->SetSnap( bFlag );
-break;
+pOpt->SetSnap( bFlag );
+break;
-case SID_HELPLINES_MOVE:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt->IsCrossHair();
+case SID_HELPLINES_MOVE:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt->IsCrossHair();
-pOpt->SetCrossHair( bFlag );
-break;
+pOpt->SetCrossHair( bFlag );
+break;
-case SID_BROWSER_MODE:
-case FN_PRINT_LAYOUT:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt->getBrowseMode();
-else if( nSlot == FN_PRINT_LAYOUT )
-bFlag = !bFlag;
-bBrowseModeChanged = bFlag != pOpt->getBrowseMode();
-// Disable "multiple layout"
-GetDocShell()->ToggleBrowserMode( bFlag, this );
-
-pOpt->setBrowseMode( bFlag );
-break;
+case SID_BROWSER_MODE:
+case FN_PRINT_LAYOUT:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt->getBrowseMode();
+else if( nSlot == FN_PRINT_LAYOUT )
+bFlag = !bFlag;
+bBrowseModeChanged = bFlag != pOpt->getBrowseMode();
+// Disable "multiple layout"
+GetDocShell()->ToggleBrowserMode( bFlag, this );
+pOpt->setBrowseMode( bFlag );
+break;
case FN_VIEW_NOTES:
-if ( STATE_TOGGLE == eState )
-bFlag = !pOpt->IsPostIts();
+if ( STATE_TOGGLE == eState )
+bFlag = !pOpt->IsPostIts();
-GetPostItMgr()->SetLayout();
-pOpt->SetPostIts( bFlag );
- if (pOpt->IsPostIts())
+GetPostItMgr()->SetLayout();
+pOpt->SetPostIts( bFlag );
+if (pOpt->IsPostIts())
GetPostItMgr()->CheckMetaText();
- break;
+break;
-case FN_VIEW_HIDDEN_PARA:
-if ( STATE_TOGGLE == eState )
-bFlag = !pOpt->IsShowHiddenPara();
+case FN_VIEW_HIDDEN_PARA:
+if ( STATE_TOGGLE == eState )
+bFlag = !pOpt->IsShowHiddenPara();
-pOpt->SetShowHiddenPara( bFlag );
-break;
+pOpt->SetShowHiddenPara( bFlag );
+break;
Re: Thoughts on LibreOffice Math
Hi Frédéric, find comments inside. Frédéric WANG schrieb: Hi all, My name is Frédéric Wang and as some you may have noticed, I've recently contributed some patches for the LibreOffice Formula Editor. For those who don't know me: I work for the MathJax project, I've been contributing to the Mozilla MathML project for several years and I recently started to do some developments on MathML in WebKit too. Some people on the MathJax user list reported issues with the mathematical formulas generated with LibreOffice and it turned out that the exported MathML code is currently quite bad. Can you please describe in more details what is wrong with the exported MathML? LibreOffice uses "Presentation Markup" and not "Content Markup". But besides that, what is bad? Hence I looked into the LibreOffice Math a few days ago, reported bugs and submitted a few patches. I'd like to share my thoughts on the situation and future of LibreOffice Math. Thomas Lange a message a long time ago about how Math could evolved: http://www.mail-archive.com/dev@sw.openoffice.org/msg00200.html. First, I note the following requirements: 1) Some people like the current Math semi-WYSIWYG interface and are familiar with the StarMath syntax. So this interface should be preserved anyway. 2) Some people would like a complete WYSIWYG editor. 3) Some people would like a LaTeX input mode to enter mathematical formulas (like in Abiword) 4) Some people (at least the MathML & MathJax communities) would like MathML import/export MathML import and export is already available. What is needed in addition? and copy and paste, like in Microsoft Word. It is also a requirement of the ODT format. 5) Some people would like a high quality rendering (e.g. for printing, to export to SVG etc). This is subjective but that would mean at least the quality level of documents generated by Microsoft Word or LaTeX. Currently, LibreOffice Math is centered around its StarMath syntax and internal tree structure, which make 1) possible and there is already an experimental visual editor to do 2). As I read the code, the MathML export is not very good but that can be improved. However, importing from more expressive language like LaTeX or MathML seems very hard and makes 3) and 4) unlikely. I didn't look at the rendering code, but Khaled Hosny mentioned on bug 32362 that it would have to be rewritten from scratch and I suspect one issue is the StarMath internal tree. I'd like to propose to center LibreOffice Math around the MathML syntax (and corresponding DOM structure) instead: * I hope I can improve the code to get a decent MathML export and thus 1) and 2) could be preserved. Do you want an export to Content Markup? It would still be possible to keep the UI to work directly on the MathML DOM. * For 3), there are many LaTeX to MathML converters like itex2MML (used in Abiword), BlahTeX, MathJax etc that could be integrated in LibreOffice. * This would obviously make 4) easy. MathML has a element which is currently used to store the StarMath syntax The StarMath code is stored in the element. and could be used to store LaTeX too. Davide Carlisle also has an XSLT stylesheet to convert MathML code to LaTeX. * Microsoft Word uses an XML language for mathematics similar to MathML so it should be possible to get 5). Khaled Hosny mentioned a fork of GtkMathView that has support for Open Type MATH and can produce a good rendering. It takes MathML as input and can export PNG or SVG images. Export to PNG already exists but needs improvement. There are not only the large goals you have outlined, but a lot of enhancement request, which are open for many years, like arbitrary colors, storing in Gallery, better integral sign. The Math module has got very small enhancements in the last years. It would be really good, if you can help in that area. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/shells/textsh.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 37e1d7a0df85530f6a67adfda76d2c06e05b569e
Author: Norbert Thiebaud
Date: Thu Jun 20 13:55:33 2013 -0500
coverity#705765: Resource leak
Change-Id: Ibf9d4716e5c5929fe47c836812879f815aa78d6c
Reviewed-on: https://gerrit.libreoffice.org/4408
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 62907a4..2b5c607 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -221,10 +221,10 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
aStrURL = URIHelper::SmartRel2Abs(
INetURLObject(), aStrURL, URIHelper::GetMaybeFileHdl() );
-INetURLObject* pURL = new INetURLObject();
-pURL->SetSmartProtocol( INET_PROT_FILE );
+INetURLObject url;
+url.SetSmartProtocol( INET_PROT_FILE );
-if ( pURL->SetURL( aStrURL, INetURLObject::WAS_ENCODED ) )
+if ( url.SetURL( aStrURL, INetURLObject::WAS_ENCODED ) )
{
OUString aName;
comphelper::EmbeddedObjectContainer aCnt;
@@ -238,7 +238,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if ( xSet.is() )
{
xSet->setPropertyValue( OUString("PluginURL"),
-uno::makeAny( OUString( pURL->GetMainURL(
INetURLObject::NO_DECODE ) ) ) );
+uno::makeAny( OUString( url.GetMainURL(
INetURLObject::NO_DECODE ) ) ) );
}
}
___
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/filter/graphicfilter2.cxx | 182 ++-
1 file changed, 98 insertions(+), 84 deletions(-)
New commits:
commit cf003b228efc9d95d85fafceb7095e85c882277c
Author: Mark Wielaard
Date: Sun Jun 23 23:07:51 2013 +0200
Robustify GraphicDescriptor::ImpDetect* reading SvStream.
The >>operator of SvStream doesn't initialize a variable if the stream
is faulty. So initialize the variables before usage to prevent accidental
matches. Also explicitly check stream status in while loop to prevent
looping on eof or error.
Change-Id: I21c0acc1c9217b4523c593cbcef5718f4cdc7597
Reviewed-on: https://gerrit.libreoffice.org/4469
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/vcl/source/filter/graphicfilter2.cxx
b/vcl/source/filter/graphicfilter2.cxx
index a9a4813..4f8e8fc 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -105,7 +105,7 @@ void GraphicDescriptor::ImpConstruct()
sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, sal_Bool
bExtendedInfo )
{
-sal_uInt16 nTemp16;
+sal_uInt16 nTemp16 = 0;
sal_BoolbRet = sal_False;
sal_Int32 nStmPos = rStm.Tell();
@@ -178,10 +178,10 @@ sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm,
sal_Bool bExtendedInfo
sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream& rStm, sal_Bool
bExtendedInfo )
{
-sal_uInt32 n32;
-sal_uInt16 n16;
+sal_uInt32 n32 = 0;
+sal_uInt16 n16 = 0;
sal_BoolbRet = sal_False;
-sal_uInt8 cByte;
+sal_uInt8 cByte = 0;
sal_Int32 nStmPos = rStm.Tell();
rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -197,7 +197,7 @@ sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream& rStm,
sal_Bool bExtendedInfo
if ( bExtendedInfo )
{
-sal_uInt16 nTemp16;
+sal_uInt16 nTemp16 = 0;
// Pixel width
rStm >> nTemp16;
@@ -245,7 +245,7 @@ sal_uInt8 ImpDetectJPG_GetNextMarker( SvStream& rStm )
sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, sal_Bool
bExtendedInfo )
{
-sal_uInt32 nTemp32;
+sal_uInt32 nTemp32 = 0;
sal_BoolbRet = sal_False;
sal_Int32 nStmPos = rStm.Tell();
@@ -297,7 +297,7 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm,
sal_Bool bExtendedInf
// per default we assume marker segments conaining a
length parameter
default :
{
-sal_uInt16 nLength;
+sal_uInt16 nLength = 0;
rStm >> nLength;
if ( nLength < 2 )
@@ -311,18 +311,18 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm,
sal_Bool bExtendedInf
{
if ( nLength == 16 )
{
-sal_Int32 nIdentifier;
+sal_Int32 nIdentifier = 0;
rStm >> nIdentifier;
if ( nIdentifier == 0x4a464946 )//
JFIF Identifier
{
-sal_uInt8 nStringTerminator;
-sal_uInt8 nMajorRevision;
-sal_uInt8 nMinorRevision;
-sal_uInt8 nUnits;
-sal_uInt16 nHorizontalResolution;
-sal_uInt16 nVerticalResolution;
-sal_uInt8
nHorzThumbnailPixelCount;
-sal_uInt8
nVertThumbnailPixelCount;
+sal_uInt8 nStringTerminator = 0;
+sal_uInt8 nMajorRevision = 0;
+sal_uInt8 nMinorRevision = 0;
+sal_uInt8 nUnits = 0;
+sal_uInt16 nHorizontalResolution
= 0;
+sal_uInt16 nVerticalResolution =
0;
+sal_uInt8
nHorzThumbnailPixelCount = 0;
+sal_uInt8
nVertThumbnailPixelCount = 0;
rStm >> nStringTerminator
>> nMajorRevision
@@ -362,13 +362,13 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm,
sal_Bool bExtendedInf
case 0xce : // SOF14
case 0xcf : // SOF15
{
-
Re: SVX ID collision
On Sun, 2013-06-23 at 14:21 +0200, Tomaž Vajngerl wrote: > Hi, > > I noticed we renumbered the ID's in "include/svx/svxids.hrc" but this > is causing problems for the toolbar/popup menu icon (it is not drawn) > and functionality for left graphic rotation (SID_ROTATE_GRAPHIC_LEFT > which is defined as [1]). I noticed that the same ID (SID_SVX_START > +1121) is added to [2] which is in "include/editeng/editids.hrc". I > think that this two IDs are colliding in some way because if I change > the number to something else, rotate left icon is drawn again > correctly. Now the question is what to do about this.. I could just > relocate the ID for SID_ROTATE_GRAPHIC_LEFT and be done, but we might > have more problems because of this. Can someone take a look at this? > > I also noticed that SID_SVX_START offset is also used by > "include/sfx2/sfxsids.hrc" and some more files, which could also cause > collisions and problems. Yeah, its an awesome mess, the SID_SVX_START block got split up over three hrc files and it's now super easy to collide ids. I'll add some comments to the three to suggest only adding new SID_SVX_START entries to the svx one and when adding a new one to svx check that it's not already taken by the other two. And then move the three post-svx-split new editeng entries out of the SID_SVX_START block to the new post-svx-split SID_EDIT_START block instead. That should presumably fix the problem. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
