LibreOffice Gerrit News for core on 2014-03-31
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#49431 PDF Import: Improve line and space detection algorithm in https://gerrit.libreoffice.org/8800 from Vort about module sdext + oox, writerfilter: add missing headers for C++ containers in https://gerrit.libreoffice.org/8796 from Douglas Mencken about module oox, writerfilter + Icon Redux 02: Optimised Galaxy theme in https://gerrit.libreoffice.org/8799 from Andrew Dent about module icon-themes + vcl-quartz: fix build of recently introduced DrawTextSpecial for OSX10.6 in https://gerrit.libreoffice.org/8790 from Douglas Mencken about module vcl + Icon Redux 02: Optimised Sifr theme in https://gerrit.libreoffice.org/8795 from Andrew Dent about module icon-themes + Icon redux 01: Tidy hicontrast icons in https://gerrit.libreoffice.org/8794 from Andrew Dent about module icon-themes + sal: add universal aligned memory allocation with malloc in https://gerrit.libreoffice.org/8405 from Douglas Mencken about module build, sal + Improved coding style as shown in examples Bug 75240. in https://gerrit.libreoffice.org/8787 from Milan Zelenka about module vcl End of freshness + fdo#73147 add Excel2010 functions NETWORKDAYS.INTL and WORKDAY.INTL in https://gerrit.libreoffice.org/8772 from Winfried Donkers about module formula, include, sc + fdo#74702 OutputDevice::ImplInitFontList() fails if no fonts on device in https://gerrit.libreoffice.org/8741 from Chris Sherlock about module vcl * Merged changes on master for project core changed in the last 25 hours: + vcl-osx fix: 'NSEvent' may not respond to '-magnification' in https://gerrit.libreoffice.org/8792 from Douglas Mencken * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn 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: 2 commits - cui/source
cui/source/tabpages/tparea.cxx | 30 --
1 file changed, 30 deletions(-)
New commits:
commit 2032e9f5d7683e49b8753d7c7362899c690005b6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 31 09:32:53 2014 +0200
cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl
This is unused since commit 5627d0bdaf1385df9d90dcec3a319c82c089c2ca
(Fix #86988#: Redesign of dialogs, 2001-05-15), and just getting rid of
it avoids a crash on Insert - Frame - Area - Bitmap in Writer.
Copypaste of problematic code, take 3.
Change-Id: Ide488585bbc6aed157fa6058bcfd1cd0a6d2c7aa
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 74b748d..85ae669 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2061,21 +2061,6 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
m_pBxBitmap-Show();
-// set table text
-OUStringaString( CUI_RES( RID_SVXSTR_TABLE ) ); aString += : ;
-INetURLObject aURL( pBitmapList-GetPath() );
-
-aURL.Append( pBitmapList-GetName() );
-DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, invalid URL );
-
-if( aURL.getBase().getLength() 18 )
-{
-aString += aURL.getBase().copy( 0, 15 );
-aString += ...;
-}
-else
-aString += aURL.getBase();
-
ModifyBitmapHdl_Impl( this );
ModifyTileHdl_Impl( m_pTsbOriginal );
}
commit f4fa202b31277276dc4f05046c82152c0830ef21
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 31 09:30:17 2014 +0200
cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl
This is unused since commit 5627d0bdaf1385df9d90dcec3a319c82c089c2ca
(Fix #86988#: Redesign of dialogs, 2001-05-15), and just getting rid of it
avoids a crash on Insert - Frame - Area - Gradient in Writer.
Copypaste of problematic code, take 2.
Change-Id: I5be2b0b3280826d50ea196f95f8ac92d7856ae7d
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 73be1ba..74b748d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1880,21 +1880,6 @@ void SvxAreaTabPage::ClickGradientHdl_Impl()
// Controls for Hatch-Background
m_pFlHatchBckgrd-Hide();
-// set table text
-OUStringaString( CUI_RES( RID_SVXSTR_TABLE ) ); aString += : ;
-INetURLObject aURL( pGradientList-GetPath() );
-
-aURL.Append( pGradientList-GetName() );
-DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, invalid URL );
-
-if( aURL.getBase().getLength() 18 )
-{
-aString += aURL.getBase().copy( 0, 15 );
-aString += ...;
-}
-else
-aString += aURL.getBase();
-
ModifyGradientHdl_Impl( this );
ModifyStepCountHdl_Impl( m_pTsbStepCount );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck reports Using 'memset' on class that contains ... (sw module)
On 03/29/2014 01:49 PM, julien2412 wrote: Cppcheck reported this: sw/source/filter/ww8/ww8scan.cxx 5158memsetClass error Using 'memset' on class that contains a virtual method. 5158memsetClass error Using 'memset' on class that contains a reference. 5158memsetClass error Using 'memset' on class that contains a 'std::map'. While the latter two would be real errors (though I don't see a good reason to warn about the first), I fail to find any reference or std::map members (or virtual function members, for that matter) in the definition of class WW8Fib in recent trunk sw/source/filter/ww8/ww8scan.hxx. (And it doesn't add to your confidence in Cppcheck if you see it use such bad language as virtual method.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/PivotLayoutDialog.hxx|2 +-
sc/source/ui/inc/PivotLayoutTreeList.hxx |2 +-
sc/source/ui/inc/PivotLayoutTreeListBase.hxx |2 +-
sc/source/ui/inc/PivotLayoutTreeListData.hxx |2 +-
sc/source/ui/inc/PivotLayoutTreeListLabel.hxx |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit e211e4ed41289fe680ac3d733175ef40a1e290b8
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Mar 31 10:10:25 2014 +0200
pivot layout dialog: remove SAL_OVERRIDE from destructors
Change-Id: Icdb048a2ad9c49308213c3bb57f540e4ff567593
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index b3eaa14..e5eb4aa 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -111,7 +111,7 @@ private:
public:
ScPivotLayoutDialog(SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow, Window* pParent,
ScViewData* pViewData, const ScDPObject*
pPivotTableObject, bool bCreateNewPivotTable);
-virtual ~ScPivotLayoutDialog() SAL_OVERRIDE;
+virtual ~ScPivotLayoutDialog();
virtual void SetReference(const ScRange rReferenceRange, ScDocument*
pDocument) SAL_OVERRIDE;
virtual void SetActive() SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/PivotLayoutTreeList.hxx
b/sc/source/ui/inc/PivotLayoutTreeList.hxx
index 00caefe..7b805ac4 100644
--- a/sc/source/ui/inc/PivotLayoutTreeList.hxx
+++ b/sc/source/ui/inc/PivotLayoutTreeList.hxx
@@ -18,7 +18,7 @@ class ScPivotLayoutTreeList : public ScPivotLayoutTreeListBase
{
public:
ScPivotLayoutTreeList(Window* pParent, WinBits nBits);
-virtual ~ScPivotLayoutTreeList() SAL_OVERRIDE;
+virtual ~ScPivotLayoutTreeList();
virtual bool DoubleClickHdl() SAL_OVERRIDE;
void Setup(ScPivotLayoutDialog* pParent, SvPivotTreeListType eType);
diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
index b44303f..b8f226d 100644
--- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
+++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
@@ -44,7 +44,7 @@ public:
void Setup(ScPivotLayoutDialog* pParent);
ScPivotLayoutTreeListBase(Window* pParent, WinBits nBits,
SvPivotTreeListType eType = UNDEFINED);
-virtual ~ScPivotLayoutTreeListBase() SAL_OVERRIDE;
+virtual ~ScPivotLayoutTreeListBase();
virtual sal_Int8 AcceptDrop(const AcceptDropEvent rEvent) SAL_OVERRIDE;
virtual bool NotifyAcceptDrop(SvTreeListEntry* pEntry) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/PivotLayoutTreeListData.hxx
b/sc/source/ui/inc/PivotLayoutTreeListData.hxx
index d6a9953..8ba5569 100644
--- a/sc/source/ui/inc/PivotLayoutTreeListData.hxx
+++ b/sc/source/ui/inc/PivotLayoutTreeListData.hxx
@@ -21,7 +21,7 @@ private:
public:
ScPivotLayoutTreeListData(Window* pParent, WinBits nBits);
-virtual ~ScPivotLayoutTreeListData() SAL_OVERRIDE;
+virtual ~ScPivotLayoutTreeListData();
virtual bool DoubleClickHdl() SAL_OVERRIDE;
void FillDataField(ScPivotFieldVector rDataFields);
diff --git a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx
b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx
index 6a13906..7eb8f52 100644
--- a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx
+++ b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx
@@ -22,7 +22,7 @@ private:
public:
ScPivotLayoutTreeListLabel(Window* pParent, WinBits nBits);
-virtual ~ScPivotLayoutTreeListLabel() SAL_OVERRIDE;
+virtual ~ScPivotLayoutTreeListLabel();
void FillLabelFields(ScDPLabelDataVector rLabelVector);
ScItemValue* GetItem(SCCOL nColumn);
bool IsDataItem(SCCOL nColumn);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 19 ++-
sc/source/ui/dbgui/PivotLayoutTreeList.cxx |4 ++--
sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |4 ++--
sc/source/ui/inc/PivotLayoutDialog.hxx |2 +-
sc/source/ui/inc/PivotLayoutTreeListBase.hxx |2 --
5 files changed, 7 insertions(+), 24 deletions(-)
New commits:
commit b53ff2865e337f173758f3430bc2a212a14c0b95
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 31 10:22:13 2014 +0200
Fix various warnings
Change-Id: I78aa55539c2a3e522736bb178ba7d445300bf1f0
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 267b7f5..48b4874 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -22,7 +22,7 @@
using namespace css::uno;
using namespace css::sheet;
-ScItemValue::ScItemValue(OUString aName, SCCOL nColumn, sal_uInt16
nFunctionMask) :
+ScItemValue::ScItemValue(OUString const aName, SCCOL nColumn, sal_uInt16
nFunctionMask) :
maName(aName),
maFunctionData(nColumn, nFunctionMask),
mpOriginalItemValue(this)
@@ -40,22 +40,7 @@ ScItemValue::~ScItemValue()
namespace
{
-OUString lclGetNameForNamedRange(ScRange aRange, ScDocument* pDocument)
-{
-OUString aName;
-
-ScRangeName* pRangeName = pDocument-GetRangeName();
-if (pRangeName == NULL)
-return aName;
-
-const ScRangeData* pData = pRangeName-findByRange(aRange);
-if (pData == NULL)
-return aName;
-
-return pData-GetName();
-}
-
-ScRange lclGetRangeForNamedRange(OUString aName, ScDocument* pDocument)
+ScRange lclGetRangeForNamedRange(OUString const aName, ScDocument* pDocument)
{
ScRange aInvalidRange(ScAddress::INITIALIZE_INVALID);
ScRangeName* pRangeName = pDocument-GetRangeName();
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 8c76aff..9eae737 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -83,7 +83,7 @@ void ScPivotLayoutTreeList::FillFields(ScPivotFieldVector
rFieldVector)
{
ScPivotField rField = *it;
ScItemValue* pItemValue = mpParent-GetItem(rField.nCol);
-InsertEntry(pItemValue-maName, NULL, sal_False, TREELIST_APPEND,
pItemValue);
+InsertEntry(pItemValue-maName, NULL, false, TREELIST_APPEND,
pItemValue);
}
}
@@ -105,7 +105,7 @@ void
ScPivotLayoutTreeList::InsertEntryForSourceTarget(SvTreeListEntry* pSource,
void ScPivotLayoutTreeList::InsertEntryForItem(ScItemValue* pItemValue,
sal_uLong nPosition)
{
OUString rName = pItemValue-maName;
-InsertEntry(rName, NULL, sal_False, nPosition, pItemValue);
+InsertEntry(rName, NULL, false, nPosition, pItemValue);
}
void ScPivotLayoutTreeList::KeyInput(const KeyEvent rKeyEvent)
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index 82cd93a..8ef80b0 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -156,7 +156,7 @@ void
ScPivotLayoutTreeListData::InsertEntryForSourceTarget(SvTreeListEntry* pSou
OUString rText = GetEntryText(pSource);
GetModel()-Remove(pSource);
sal_uLong nPosition = (pTarget == NULL) ? TREELIST_APPEND :
GetModel()-GetAbsPos(pTarget) + 1;
-InsertEntry(rText, NULL, sal_False, nPosition, pItemValue);
+InsertEntry(rText, NULL, false, nPosition, pItemValue);
}
else
{
@@ -184,7 +184,7 @@ void
ScPivotLayoutTreeListData::InsertEntryForItem(ScItemValue* pItemValue, sal_
pDataItemValue-maName,
rFunctionData.mnDupCount);
-InsertEntry(sDataName, NULL, sal_False, nPosition, pDataItemValue);
+InsertEntry(sDataName, NULL, false, nPosition, pDataItemValue);
}
void ScPivotLayoutTreeListData::KeyInput(const KeyEvent rKeyEvent)
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index e5eb4aa..b7ad9cd 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -33,7 +33,7 @@ public:
ScPivotFuncData maFunctionData;
ScItemValue* mpOriginalItemValue;
-ScItemValue(OUString aName, SCCOL nColumn, sal_uInt16 nFunctionMask);
+ScItemValue(OUString const aName, SCCOL nColumn, sal_uInt16
nFunctionMask);
ScItemValue(ScItemValue* pInputItemValue);
virtual ~ScItemValue();
diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
index b8f226d..26d94a1 100644
--- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
+++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx
@@ -33,8 +33,6 @@ public:
COLUMN_LIST,
DATA_LIST
};
-private:
-bool mbIsInternalDrag;
protected:
SvPivotTreeListType meType;
[Libreoffice-commits] core.git: 2 commits - framework/source vcl/source
framework/source/fwe/classes/addonsoptions.cxx | 28 -
vcl/source/window/window2.cxx |2 -
2 files changed, 1 insertion(+), 29 deletions(-)
New commits:
commit 902ed18886e321e80a95250fee423f6e871ceb28
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 09:20:02 2014 +0100
use toBool
Change-Id: I334570bac6f0ab8fbd606610f0dcd812041c72b1
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index acab1b8..73fe674 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1865,7 +1865,7 @@ bool Window::set_font_attribute(const OString rKey,
const OString rValue)
aFont.SetItalic(ITALIC_NORMAL);
SetControlFont(aFont);
}
-else if (rKey == underline rValue == True)
+else if (rKey == underline toBool(rValue) == true)
{
Font aFont(GetControlFont());
aFont.SetUnderline(UNDERLINE_SINGLE);
commit e6ff457de6f99c7c51e8dfe4295f4be7fbbc94a0
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 09:17:13 2014 +0100
callcatcher: update unused code
Change-Id: I9d8601eb66a460702530e013bf573c6482c49c0b
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index 05b296b..2387e57 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -351,7 +351,6 @@ class AddonsOptions_Impl : public ConfigItem
void SubstituteVariables( OUString aURL );
bool ReadSubMenuEntries( const Sequence OUString
aSubMenuNodeNames, Sequence Sequence PropertyValue rSubMenu );
-void InsertToolBarSeparator( Sequence Sequence
PropertyValue rAddonOfficeToolBarSeq );
OUString GeneratePrefixURL();
Sequence OUString GetPropertyNamesMenuItem( const OUString
aPropertyRootNode ) const;
@@ -874,34 +873,7 @@ bool AddonsOptions_Impl::ReadToolBarItemSet( const
OUString rToolBarItemSetNode
return ( (sal_uInt32)rAddonOfficeToolBarSeq.getLength()
nToolBarItemCount );
}
-
-// private method
-
-void AddonsOptions_Impl::InsertToolBarSeparator( Sequence Sequence
PropertyValue rAddonOfficeToolBarSeq )
-{
-Sequence PropertyValueaToolBarItem( PROPERTYCOUNT_TOOLBARITEM );
-
-aToolBarItem[ OFFSET_TOOLBARITEM_URL].Name = m_aPropNames[
INDEX_URL];
-aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[
INDEX_TITLE ];
-aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER].Name = m_aPropNames[
INDEX_IMAGEIDENTIFIER];
-aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[
INDEX_TARGET ];
-aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT].Name = m_aPropNames[
INDEX_CONTEXT];
-
-aToolBarItem[ OFFSET_TOOLBARITEM_URL].Value =
SEPARATOR_URL;
-aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value = m_aEmpty;
-aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value = m_aEmpty;
-aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER].Value = m_aEmpty;
-aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT].Value = m_aEmpty;
-
-sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength();
-rAddonOfficeToolBarSeq.realloc( nToolBarItemCount+1 );
-rAddonOfficeToolBarSeq[nToolBarItemCount] = aToolBarItem;
-}
-
-
-
// private method
-
void AddonsOptions_Impl::ReadImages( ImageManager aImageManager )
{
// Read the user-defined Images set and fill image manager
___
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/filter/ww8/writerhelper.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b850adf13ec8fad5f1e49c06fbb1d81a546b4636
Author: Caolán McNamara caol...@redhat.com
Date: Sun Mar 30 21:24:11 2014 +0100
coverity#1194932 Uncaught exception
Change-Id: Ia1811b7ec040887079d90ac611316983c1e77b03
diff --git a/sw/source/filter/ww8/writerhelper.hxx
b/sw/source/filter/ww8/writerhelper.hxx
index a29a781..6955e97 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -320,7 +320,7 @@ namespace sw
a href=mailto:c...@openoffice.org;Caolaacute;n McNamara/a
*/
templateclass T const T ItemGet(const SwFmt rFmt,
-sal_uInt16 eType) throw(std::bad_cast)
+sal_uInt16 eType) throw(std::bad_cast, css::uno::RuntimeException)
{
return item_castT(rFmt.GetFmtAttr(eType));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/opengl-3D-bar-rendering' - 3 commits - chart2/source vcl/source
chart2/source/view/main/3DChartObjects.hxx | 71 -
chart2/source/view/main/OpenGLRender.cxx | 21
vcl/source/opengl/OpenGLContext.cxx| 18 +++
3 files changed, 10 insertions(+), 100 deletions(-)
New commits:
commit 0105c27a93dcb91dcd1eeb3f1a7c4d7f7692f28a
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 31 10:53:57 2014 +0200
remove file
Change-Id: I74d1116ae0d5f99bcfbbe67ec1ecbe1a5a89ad8f
diff --git a/chart2/source/view/main/3DChartObjects.hxx
b/chart2/source/view/main/3DChartObjects.hxx
deleted file mode 100644
index ec56ad8..000
--- a/chart2/source/view/main/3DChartObjects.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include glm/glm.hpp
-
-#include tools/color.hxx
-#include vcl/bitmapex.hxx
-
-namespace chart {
-
-namespace opengl3D {
-
-class Renderable3DObject
-{
-public:
-
-virtual ~Renderable3DObject() {};
-
-virtual void render() {}
-};
-
-class Bar : public Renderable3DObject
-{
-public:
-Bar( const glm::mat4 rPosition );
-private:
-bool mbRoundedCorners;
-glm::mat4 maPos;
-Color maColor; // RGBA fill color
-sal_Int32 nUniqueId;
-};
-
-class Line : public Renderable3DObject
-{
-private:
-glm::vec3 maPosBegin;
-glm::vec3 maPosEnd;
-Color maLineColor; // RGBA line color
-sal_Int32 nUniqueId;
-};
-
-class Text : public Renderable3DObject
-{
-private:
-BitmapEx maText;
-glm::vec3 maTopLeft;
-glm::vec3 maBottomRight;
-sal_Int32 nUniqueId;
-};
-
-class Rectangle : public Renderable3DObject
-{
-private:
-glm::vec3 maTopLeft;
-glm::vec3 maBottomRight;
-sal_Int32 nUniqueId;
-Color maColor; // RGBA fill color
-Color maLineColor; // RGBA line color
-};
-
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5c6081b09cabc5cd32835fbdee6c4af5fe683095
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 31 04:03:12 2014 +0200
OSL_TRACE to SAL_INFO in opengl code
Change-Id: I7bdefec1cf941d1a51b639c0979387e1b436
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 560ff03..06920fa 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -336,7 +336,7 @@ bool OpenGLContext::init( Window* pParent )
GL_TRUE);
if( m_aGLWin.ctx == NULL )
{
-OSL_TRACE(unable to create GLX context);
+SAL_INFO(vcl.opengl, unable to create GLX context);
return false;
}
#endif
@@ -384,7 +384,7 @@ bool OpenGLContext::init( Window* pParent )
#elif defined( UNX )
if( !glXMakeCurrent( m_aGLWin.dpy, m_aGLWin.win, m_aGLWin.ctx ) )
{
-OSL_TRACE(unable to select current GLX context);
+SAL_INFO(vcl.opengl, unable to select current GLX context);
return false;
}
@@ -392,10 +392,10 @@ bool OpenGLContext::init( Window* pParent )
double nGLXVersion = 0;
if( glXQueryVersion( m_aGLWin.dpy, glxMajor, glxMinor ) )
nGLXVersion = glxMajor + 0.1*glxMinor;
-OSL_TRACE(available GLX version: %f, nGLXVersion);
+SAL_INFO(vcl.opengl, available GLX version: %f, nGLXVersion);
m_aGLWin.GLExtensions = glGetString( GL_EXTENSIONS );
-OSL_TRACE(available GL extensions: %s, m_aGLWin.GLExtensions);
+SAL_INFO(vcl.opengl, available GL extensions: %s,
m_aGLWin.GLExtensions);
if( m_aGLWin.HasGLXExtension(GLX_SGI_swap_control ) )
{
@@ -417,9 +417,9 @@ bool OpenGLContext::init( Window* pParent )
XSync(m_aGLWin.dpy, false);
if( errorTriggered )
-OSL_TRACE(error when trying to set swap interval, NVIDIA or Mesa
bug?);
+SAL_INFO(vcl.opengl, error when trying to set swap interval,
NVIDIA or Mesa bug?);
else
-OSL_TRACE(set swap interval to 1 (enable vsync));
+SAL_INFO(vcl.opengl, set swap interval to 1 (enable vsync));
// restore the error handler
XSetErrorHandler( oldHandler );
@@ -514,7 +514,7 @@ bool OpenGLContext::initWindow()
m_aGLWin.win = sysData-aWindow;
-OSL_TRACE(parent window: %d, m_aGLWin.win);
+SAL_INFO(vcl.opengl, parent window: %d, m_aGLWin.win);
XWindowAttributes xattr;
XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, xattr );
@@ -577,7 +577,7 @@ bool OpenGLContext::initWindow()
{
SystemWindowData winData;
winData.nSize = sizeof(winData);
-OSL_TRACE(using VisualID %08X, vi-visualid);
+SAL_INFO(vcl.opengl, using VisualID %08X, vi-visualid);
winData.pVisual = (void*)(vi-visual);
[Libreoffice-commits] core.git: 8 commits - sfx2/source svx/source sw/source
sfx2/source/control/bindings.cxx|4 +---
sfx2/source/dialog/tabdlg.cxx |4 +++-
sfx2/source/doc/sfxbasemodel.cxx|2 +-
svx/source/svdraw/svdedtv2.cxx |2 +-
sw/source/core/docnode/swbaslnk.cxx |2 +-
sw/source/core/frmedt/fecopy.cxx|4 ++--
sw/source/core/layout/pagechg.cxx |2 +-
sw/source/core/uibase/utlui/content.cxx | 21 +++--
8 files changed, 25 insertions(+), 16 deletions(-)
New commits:
commit 6bc678d61478ce0f54e14ad2ef0d4897e7bf5763
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 09:53:53 2014 +0100
coverity#1194890 Unchecked return value
Change-Id: I7c1e74f5c685f10d7eba8afb7acb60d2c2e9906b
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 94e3424..9eece34 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2983,7 +2983,7 @@ void SfxBaseModel::impl_store( const OUString
sURL
}
uno::Sequence beans::NamedValue
aOldEncryptionData;
-GetEncryptionData_Impl( pMedium-GetItemSet(),
aOldEncryptionData );
+(void)GetEncryptionData_Impl(
pMedium-GetItemSet(), aOldEncryptionData );
if ( !aOldEncryptionData.getLength()
!aNewEncryptionData.getLength() )
throw;
commit b3b8c56de80d5dc82e0138c28e8dadaeefb8daf7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 09:51:30 2014 +0100
coverity#1194888 Unchecked return value
Change-Id: Id9478984bdfd11a3cb656e5c8441e1b205282c2b
diff --git a/sw/source/core/docnode/swbaslnk.cxx
b/sw/source/core/docnode/swbaslnk.cxx
index 2ccf290..633ef61 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -396,7 +396,7 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool
bNativFormat )
{
OUString aMimeType( SotExchange::GetFormatMimeType( GetContentType()
));
uno::Any aValue;
-GetObj()-GetData( aValue, aMimeType, !IsSynchron() bWaitForData );
+(void)GetObj()-GetData( aValue, aMimeType, !IsSynchron()
bWaitForData );
if( bWaitForData !GetObj() )
{
commit 14dd082b247ec1eecb4c26bcde06f370201e9f30
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 09:47:30 2014 +0100
coverity#1194907 Explicit null dereferenced
Change-Id: I985c91f5b29d3642ca03355c9c6218ae94735549
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index c82e4e6..29bc434 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1266,7 +1266,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
const sal_uInt32 nPolyCount(aPolyPolygon.count());
-if(nPolyCount)
+if (nPolyCount pAttrObj)
{
SdrObjKind eKind = OBJ_PATHFILL;
commit e8506c99ca303774c677e2978357839e1aeb11eb
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 09:44:46 2014 +0100
coverity#705489 Dereference null return value
Change-Id: I5366c5d653d553494a33b6ea3f511e7d0a56a86d
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 6e64d99..57385e5 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1376,9 +1376,9 @@ void SwFEShell::Paste( SvStream rStrm, sal_uInt16
nAction, const Point* pPt )
Point aNullPt;
SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pFmt)-GetFrm( aNullPt
);
-pAnchor = pFlyFrm-GetAnchorFrm();
+pAnchor = pFlyFrm ? pFlyFrm-GetAnchorFrm() : NULL;
-if( pAnchor-FindFooterOrHeader() )
+if (!pAnchor || pAnchor-FindFooterOrHeader())
{
// if there is a textframe in the header/footer:
// do not replace but insert
commit c1a1ec5391cfbb814f67ec903bf6a25ae38597f9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 09:41:46 2014 +0100
coverity#1194926 Dereference before null check
Change-Id: I1825de227b760624faaa68a1de2d3ecd5b7657a5
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 037e06c..ff309bc 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1118,9 +1118,7 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16
nId, const SfxPoolItem*
SfxShell *pShell=0;
const SfxSlot *pSlot=0;
-// if slot was uncached, we should have created a cache in this method!
-DBG_ASSERT( pCache, This code needs a cache!);
-const SfxSlotServer* pServer = pCache ? pCache-GetSlotServer(
rDispatcher, pImp-xProv ) : 0;
+const SfxSlotServer* pServer = pCache-GetSlotServer( rDispatcher,
pImp-xProv );
[Libreoffice-commits] core.git: 2 commits - sc/qa
sc/qa/unit/filters-test.cxx|7 +++
sc/qa/unit/subsequent_filters-test.cxx |4
2 files changed, 11 insertions(+)
New commits:
commit af9cb57b0d260eeb3433ab41d61b4b776b26e87f
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 31 11:00:14 2014 +0200
close files after test
Change-Id: Ibf04fa79570a2417c965e773a789827a86787471
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 7c974c8..9d0368d 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2423,6 +2423,8 @@ void ScFiltersTest::testPrintRangeODS()
pRange = pDoc-GetRepeatRowRange(1);
CPPUNIT_ASSERT(pRange);
CPPUNIT_ASSERT_EQUAL(ScRange(0,2,0,0,4,0), *pRange);
+
+xDocSh-DoClose();
}
void ScFiltersTest::testOutlineODS()
@@ -2476,6 +2478,8 @@ void ScFiltersTest::testOutlineODS()
bool bVisible = pEntry-IsVisible();
CPPUNIT_ASSERT_EQUAL(aRow[i].bVisible, bVisible);
}
+
+xDocSh-DoClose();
}
void ScFiltersTest::testColumnStyleXLSX()
commit 3d28cd4df4e951be29294c7ca5b820d711c5a7eb
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 31 10:57:13 2014 +0200
close the file at the end of the test
Change-Id: I9e0636af65258646572da126e93766552fa1e1df
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index e556d53..b6d7d76 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -438,6 +438,8 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
pDoc = xDocSh-GetDocument();
CPPUNIT_ASSERT(pDoc);
impl_testLegacyCellAnchoredRotatedShape( pDoc, aRect, aAnchor );
+
+xDocSh-DoClose();
}
{
// This example doc contains cell anchored shape that is rotated, the
@@ -466,6 +468,7 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
// apply hefty ( 1 mm ) tolerence here, as some opensuse tinderbox
// failing
impl_testLegacyCellAnchoredRotatedShape( pDoc, aRect, aAnchor, 100 );
+
xDocSh-DoClose();
}
{
@@ -491,6 +494,8 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
pDoc = xDocSh-GetDocument();
CPPUNIT_ASSERT(pDoc);
impl_testLegacyCellAnchoredRotatedShape( pDoc, aRect, aAnchor );
+
+xDocSh-DoClose();
}
}
@@ -509,6 +514,8 @@ void ScFiltersTest::testEnhancedProtectionXLS()
CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 1, 0, 0, 2, 0))); //
union of two different editables
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 0, 0, 0, 1, 0))); //
union of locked and editable
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 2, 0, 0, 3, 0))); //
union of editable and password editable
+
+xDocSh-DoClose();
}
ScFiltersTest::ScFiltersTest()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/texteffectscontext.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9900c41c963755a65e5452fde6ab9db5b5f42e26
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 10:06:18 2014 +0100
coverity#1194923 Missing break in switch
and coverity#1194924
Change-Id: I1225745b22d27918ff3efe3ad8f0a7d69ed2f015
diff --git a/oox/source/drawingml/texteffectscontext.cxx
b/oox/source/drawingml/texteffectscontext.cxx
index 6107896..a4cfd7a 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -135,6 +135,7 @@ void TextEffectsContext::processAttributes(const
AttributeList rAttribs)
{
pushAttributeToGrabBag(OOX_TOKEN(w14, rad), rad, rAttribs);
}
+break;
case OOX_TOKEN(w14, srgbClr):
case OOX_TOKEN(w14, schemeClr):
case OOX_TOKEN(w14, tint):
@@ -192,6 +193,7 @@ void TextEffectsContext::processAttributes(const
AttributeList rAttribs)
{
pushAttributeToGrabBag(OOX_TOKEN(w14, val), val, rAttribs);
}
+break;
case OOX_TOKEN(w14, gs):
{
pushAttributeToGrabBag(OOX_TOKEN(w14, pos), pos, rAttribs);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit 6ef6e882f9dc802ad1e07e9424d5479549a61f9a Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 31 10:13:20 2014 +0100 lint-ui spacings Change-Id: I09a1e84dc20aeeac6b535dbbedfc0f9c8e17517b diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui index e1a7b9e..549bdd0 100644 --- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui +++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui @@ -5,14 +5,14 @@ !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=PivotTableLayout property name=can_focusFalse/property +property name=border_width6/property property name=title translatable=yesPivot Table Layout/property property name=type_hintdialog/property -property name=use_header_bar0/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 property name=can_focusFalse/property property name=orientationvertical/property -property name=spacing2/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=dialog-action_area1 property name=can_focusFalse/property @@ -22,6 +22,8 @@ property name=labelgtk-ok/property property name=visibleTrue/property property name=can_focusTrue/property +property name=can_defaultTrue/property +property name=has_defaultTrue/property property name=receives_defaultTrue/property property name=use_stockTrue/property /object @@ -369,6 +371,7 @@ object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property +property name=top_padding6/property property name=left_padding12/property child object class=GtkGrid id=grid3 @@ -504,6 +507,7 @@ object class=GtkAlignment id=alignment2 property name=visibleTrue/property property name=can_focusFalse/property +property name=top_padding6/property property name=left_padding12/property child object class=GtkGrid id=grid4 @@ -639,6 +643,7 @@ object class=GtkAlignment id=alignment3 property name=visibleTrue/property property name=can_focusFalse/property +property name=top_padding6/property property name=left_padding12/property child object class=GtkGrid id=grid5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 2fc50ff8bea6f64b367d44a1760b8dd9fb69a401 Author: László Németh nem...@numbertext.org Date: Mon Mar 31 11:12:57 2014 +0200 fdo#75109 librelogo: fix localized procedures Change-Id: Ia6edb02b871a41828758ba5fd5376c811c4084cc diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 665ec74..a923e0e 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1703,11 +1703,16 @@ def __compil__(s): if len(subnames) 0: globs = global %s % , .join(subnames) # search user functions (function calls with two or more arguments need explicite Python parentheses) +ends = __l12n__(_.lng)[END] # support multiple names of END +firstend = ends.split(|)[0] +s = re.sub(r(?!:)\b(?:%s)\b % ends, firstend, s) +__l12n__(_.lng)[END] = firstend functions += [ re.findall((?u)\w+,i[0])[0] for i in re.findall(r(?iu)(?=__def__ )([^\n]*)\n # beginning of a procedure (?:[^\n]*(?!\b(%(END)s))\n)* # 0 or more lines (not END) [^\n]*\b(?:%(OUTPUT)s)\b[^\n]*\n # line with OUTPUT (functions = procedures with OUTPUT) (?:[^\n]*(?!\b(?:%(END)s))\n)* # 0 or more lines (not END) -[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of END doesn't supported) +[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] +__l12n__(_.lng)[END] = ends # add line breaks before procedure calls procedures = set(subnames) - set(functions) if len(procedures) 0: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/Library_sb.mk basic/source smoketest/data
basic/Library_sb.mk |1
basic/source/classes/sbxmod.cxx |5 -
basic/source/inc/sbdiagnose.hxx | 29 ---
basic/source/runtime/rtlproto.hxx|1
basic/source/runtime/sbdiagnose.cxx | 126 ---
basic/source/runtime/stdobj.cxx |2
smoketest/data/Basic/Standard/Global.xml |6 -
7 files changed, 170 deletions(-)
New commits:
commit 0015c9807f85fd8095e5f8e922b08f98ba5a9d6c
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 31 11:20:57 2014 +0200
Remove unused BASIC CaptureAssertions functionality
...that had originally been introduced to catch DBG_ASSERTs during
smoketest,
but since made effectively unused when basing DBG_ASSERT on the sal/log.hxx
functionality, and obsoleted by the ongoing clean-up of using true assert
where
appliable.
Change-Id: I2fb4f5d0873d29595b178057f83c1404c0085575
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 7c355f7..29fdd30 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -100,7 +100,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/iosys \
basic/source/runtime/props \
basic/source/runtime/runtime \
- basic/source/runtime/sbdiagnose \
basic/source/runtime/stdobj \
basic/source/runtime/stdobj1 \
))
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 8cd6588..03fc555 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -26,7 +26,6 @@
#include tools/shl.hxx
#include basic/sbx.hxx
#include basic/sbuno.hxx
-#include sbdiagnose.hxx
#include sb.hxx
#include sbjsmeth.hxx
#include sbjsmod.hxx
@@ -1244,10 +1243,6 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
GlobalRunDeInit();
-#ifdef DBG_UTIL
-ResetCapturedAssertions();
-#endif
-
if( xVBACompat.is() )
{
// notify all VBA script listeners about the stopped script
diff --git a/basic/source/inc/sbdiagnose.hxx b/basic/source/inc/sbdiagnose.hxx
deleted file mode 100644
index d530e59..000
--- a/basic/source/inc/sbdiagnose.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
-
-#ifdef DBG_UTIL
-voidResetCapturedAssertions();
-#endif
-
-#endif // INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/rtlproto.hxx
b/basic/source/runtime/rtlproto.hxx
index 90e7851..18d2a66 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -360,7 +360,6 @@ extern RTLFUNC(CDateToIso);
extern RTLFUNC(CDateFromIso);
extern RTLFUNC(CompatibilityMode);
extern RTLFUNC(CDec);
-extern RTLFUNC(CaptureAssertions);
extern RTLFUNC(Partition); // Fong
diff --git a/basic/source/runtime/sbdiagnose.cxx
b/basic/source/runtime/sbdiagnose.cxx
deleted file mode 100644
index 4598d80..000
--- a/basic/source/runtime/sbdiagnose.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 236d87d529ed4c5c4b19320f222ac2cc8b0312ae Author: László Németh nem...@numbertext.org Date: Mon Mar 31 11:12:57 2014 +0200 fdo#75109 librelogo: fix localized procedures Change-Id: Ia6edb02b871a41828758ba5fd5376c811c4084cc diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 7b5930b..d44ffa1 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1607,11 +1607,16 @@ def __compil__(s): if len(subnames) 0: globs = global %s % , .join(subnames) # search user functions (function calls with two or more arguments need explicite Python parentheses) +ends = __l12n__(_.lng)[END] # support multiple names of END +firstend = ends.split(|)[0] +s = re.sub(r(?!:)\b(?:%s)\b % ends, firstend, s) +__l12n__(_.lng)[END] = firstend functions += [ re.findall((?u)\w+,i[0])[0] for i in re.findall(r(?iu)(?=__def__ )([^\n]*)\n # beginning of a procedure (?:[^\n]*(?!\b(%(END)s))\n)* # 0 or more lines (not END) [^\n]*\b(?:%(OUTPUT)s)\b[^\n]*\n # line with OUTPUT (functions = procedures with OUTPUT) (?:[^\n]*(?!\b(?:%(END)s))\n)* # 0 or more lines (not END) -[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of END doesn't supported) +[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] +__l12n__(_.lng)[END] = ends # add line breaks before procedure calls procedures = set(subnames) - set(functions) if len(procedures) 0: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 1a883af91567fd86b966d6fb4d7d33c1110067db Author: László Németh nem...@numbertext.org Date: Mon Mar 31 11:12:57 2014 +0200 fdo#75109 librelogo: fix localized procedures Change-Id: Ia6edb02b871a41828758ba5fd5376c811c4084cc diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 7b5930b..d44ffa1 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1607,11 +1607,16 @@ def __compil__(s): if len(subnames) 0: globs = global %s % , .join(subnames) # search user functions (function calls with two or more arguments need explicite Python parentheses) +ends = __l12n__(_.lng)[END] # support multiple names of END +firstend = ends.split(|)[0] +s = re.sub(r(?!:)\b(?:%s)\b % ends, firstend, s) +__l12n__(_.lng)[END] = firstend functions += [ re.findall((?u)\w+,i[0])[0] for i in re.findall(r(?iu)(?=__def__ )([^\n]*)\n # beginning of a procedure (?:[^\n]*(?!\b(%(END)s))\n)* # 0 or more lines (not END) [^\n]*\b(?:%(OUTPUT)s)\b[^\n]*\n # line with OUTPUT (functions = procedures with OUTPUT) (?:[^\n]*(?!\b(?:%(END)s))\n)* # 0 or more lines (not END) -[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of END doesn't supported) +[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] +__l12n__(_.lng)[END] = ends # add line breaks before procedure calls procedures = set(subnames) - set(functions) if len(procedures) 0: ___ 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' - 3 commits - oox/inc oox/source
oox/inc/oox/drawingml/textbodyproperties.hxx|1 +
oox/inc/oox/drawingml/textcharacterproperties.hxx |2 ++
oox/source/drawingml/textbodyproperties.cxx |4 ++--
oox/source/drawingml/textbodypropertiescontext.cxx |4 ++--
oox/source/drawingml/textcharacterproperties.cxx|3 +++
oox/source/drawingml/textcharacterpropertiescontext.cxx |4
oox/source/drawingml/transform2dcontext.cxx |3 ++-
7 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit e05d649cbbafe9b22176a49fc316069e89926e70
Author: Muthu Subramanian sumu...@collabora.com
Date: Mon Mar 31 15:13:51 2014 +0530
n#870234: Import gradfill for text colors.
Uses the first color from the gradfill list.
(Which is better than plain black!)
Ported from: cfc76de83e3c0a56abd30a8f3bd7c69d3500d223
Change-Id: I57a3a54a8053a8ce320acbd02940f10941165d1c
diff --git a/oox/inc/oox/drawingml/textcharacterproperties.hxx
b/oox/inc/oox/drawingml/textcharacterproperties.hxx
index 1073fa6..35943da 100644
--- a/oox/inc/oox/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/oox/drawingml/textcharacterproperties.hxx
@@ -24,6 +24,7 @@
#include oox/helper/propertymap.hxx
#include oox/drawingml/color.hxx
#include oox/drawingml/textfont.hxx
+#include oox/drawingml/fillproperties.hxx
namespace oox { class PropertySet; }
@@ -53,6 +54,7 @@ struct TextCharacterProperties
OptValue bool moItalic;
OptValue bool moUnderlineLineFollowText;
OptValue bool moUnderlineFillFollowText;
+GradientFillProperties maGradientProps; /// Properties for gradient
text colors
/** Overwrites all members that are explicitly set in rSourceProps. */
voidassignUsed( const TextCharacterProperties
rSourceProps );
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index bc23204..4800630 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -60,6 +60,7 @@ void TextCharacterProperties::assignUsed( const
TextCharacterProperties rSource
moItalic.assignIfUsed( rSourceProps.moItalic );
moUnderlineLineFollowText.assignIfUsed(
rSourceProps.moUnderlineLineFollowText );
moUnderlineFillFollowText.assignIfUsed(
rSourceProps.moUnderlineFillFollowText );
+maGradientProps.assignUsed( rSourceProps.maGradientProps );
}
void TextCharacterProperties::pushToPropMap( PropertyMap rPropMap, const
XmlFilterBase rFilter, bool bUseOptional ) const
@@ -93,6 +94,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap
rPropMap, const XmlFil
if( maCharColor.isUsed() )
rPropMap[ PROP_CharColor ] = maCharColor.getColor(
rFilter.getGraphicHelper() );
+if( maGradientProps.maGradientStops.size() 0 )
+rPropMap[ PROP_CharColor ] =
maGradientProps.maGradientStops.begin()-second.getColor(
rFilter.getGraphicHelper() );
if( moLang.has() !moLang.get().isEmpty() )
{
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 13af2cd..ec37a07 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -161,6 +161,10 @@ Reference XFastContextHandler
TextCharacterPropertiesContext::createFastChild
case A_TOKEN( hlinkMouseOver ): // CT_Hyperlink
xRet.set( new HyperLinkContext( *this, xAttributes,
mrTextCharacterProperties.maHyperlinkPropertyMap ) );
break;
+
+case A_TOKEN( gradFill ):
+xRet.set( new GradientFillContext( *this, xAttributes,
mrTextCharacterProperties.maGradientProps ) );
+break;
}
if( !xRet.is() )
xRet.set( this );
commit 193ecefaef948272695b0dd0a42a3bcc3256f631
Author: Muthu Subramanian sumu...@collabora.com
Date: Mon Mar 31 15:04:31 2014 +0530
n#862510: anchorCtr controls the anchoring as well.
Ported from: c17eb67460293fbe72ffa8e80cd10743df493afa
Change-Id: I7b5885c3ac9ec30970bdb8b2c9318dc181dda5bd
diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx
b/oox/inc/oox/drawingml/textbodyproperties.hxx
index f8800be..c026b4e 100644
--- a/oox/inc/oox/drawingml/textbodyproperties.hxx
+++ b/oox/inc/oox/drawingml/textbodyproperties.hxx
@@ -34,6 +34,7 @@ struct TextBodyProperties
{
PropertyMap maPropertyMap;
OptValue sal_Int32moRotation;
+boolmbAnchorCtr;
OptValue sal_Int32moVert;
boost::optional sal_Int32 moInsets[4];
boost::optional sal_Int32 moTextOffX;
diff --git a/oox/source/drawingml/textbodyproperties.cxx
b/oox/source/drawingml/textbodyproperties.cxx
index
Mathias Supp license statement
Hi together, All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Mit freundlichen Gruessen / Best regards Mathias Supp - Software-Architect PPT2 Vector Informatik GmbH Philipp-Reis-Straße 1 76137 Karlsruhe Deutschland / Germany Tel.: +49 721 91430-215 Fax: +49 721 91430- mailto: mathias.s...@vector.commailto:mathias.s...@vector.com Internet: www.vector.comhttp://www.vector.com/ Sitz der Gesellschaft / Head Office: Stuttgart Handelsregister / Commercial Register: Amtsgericht Stuttgart, HRB 17317 Geschaeftsfuehrer / Managing Directors: Dr. Thomas Beck, Thomas Riegraf - ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/complex/checkColor/CheckChangeColor.java |3 -
sw/qa/extras/rtfimport/rtfimport.cxx |3 -
sw/source/core/unocore/unostyle.cxx| 42 ++---
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit e826950e9d7736a6e3f9042755ba1b528f58a505
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 31 11:51:24 2014 +0200
sw: still use SvxBrushItem for page style background
Commit 6e61ecd09679a66060f932835622821d39e92f01 (Merge back branch
alg_writerframes to trunk, 2014-03-19) changed the sw UNO API, so that
in case SvxBrushItem / RES_BACKGROUND was to be get/set, it mapped that
to svx's fill style.
This has two problems: 1) it does not work (see the failing unit test)
and also page style editing UI sets SvxBrushItem, so even if the UI is
used to (actually successfully) set the page background, it won't be
saved to ODF.
So, do this background - fill style mapping only for frames for now.
Change-Id: I734880a40c891ae9e341cbddf8f88b0462361aac
diff --git a/sw/qa/complex/checkColor/CheckChangeColor.java
b/sw/qa/complex/checkColor/CheckChangeColor.java
index 017ecc3..9324e35 100644
--- a/sw/qa/complex/checkColor/CheckChangeColor.java
+++ b/sw/qa/complex/checkColor/CheckChangeColor.java
@@ -59,7 +59,6 @@ public class CheckChangeColor {
// create a PropertySet to set the properties for the new Pagestyle
XPropertySet xPropertySet =
UnoRuntime.queryInterface(XPropertySet.class,
xPageStyleCollection.getByName(Standard) );
-/* FIXME port to FillAttributes
assertEquals(
BackColor, new Any(Type.LONG, 0x),
Any.complete(xPropertySet.getPropertyValue(BackColor)));
@@ -77,7 +76,7 @@ public class CheckChangeColor {
Any.complete(xPropertySet.getPropertyValue(BackColor)));
assertEquals(
IsLandscape, new Any(Type.BOOLEAN, true),
-Any.complete(xPropertySet.getPropertyValue(IsLandscape)));*/
+Any.complete(xPropertySet.getPropertyValue(IsLandscape)));
}
@Before public void setUpDocument() throws com.sun.star.uno.Exception {
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index bd8828f..cb19476 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1096,15 +1096,12 @@ DECLARE_RTFIMPORT_TEST(testFdo64671, fdo64671.rtf)
getRun(getParagraph(1), 1, OUString(\xC5\xBD, 2, RTL_TEXTENCODING_UTF8));
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_RTFIMPORT_TEST(testPageBackground, page-background.rtf)
{
// The problem was that \background was ignored.
uno::Referencebeans::XPropertySet
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050),
getPropertysal_Int32(xPageStyle, BackColor));
}
-#endif
DECLARE_RTFIMPORT_TEST(testFdo62044, fdo62044.rtf)
{
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 4625416..982b612 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1745,19 +1745,22 @@ static void lcl_SetStyleProperty(const
SfxItemPropertySimpleEntry rEntry,
}
case RES_BACKGROUND:
{
-//
-SfxItemSet rStyleSet = rBase.GetItemSet();
-const SvxBrushItem
aOriginalBrushItem(getSvxBrushItemFromSourceSet(rStyleSet));
-SvxBrushItem aChangedBrushItem(aOriginalBrushItem);
+if (SFX_STYLE_FAMILY_FRAME == eFamily)
+{
+//
+SfxItemSet rStyleSet = rBase.GetItemSet();
+const SvxBrushItem
aOriginalBrushItem(getSvxBrushItemFromSourceSet(rStyleSet));
+SvxBrushItem aChangedBrushItem(aOriginalBrushItem);
-aChangedBrushItem.PutValue(aValue, nMemberId);
+aChangedBrushItem.PutValue(aValue, nMemberId);
-if(!(aChangedBrushItem == aOriginalBrushItem))
-{
-setSvxBrushItemAsFillAttributesToTargetSet(aChangedBrushItem,
rStyleSet);
-}
+if(!(aChangedBrushItem == aOriginalBrushItem))
+{
+
setSvxBrushItemAsFillAttributesToTargetSet(aChangedBrushItem, rStyleSet);
+}
-bDone = true;
+bDone = true;
+}
break;
}
case OWN_ATTR_FILLBMP_MODE:
@@ -2499,16 +2502,19 @@ static uno::Any lcl_GetStyleProperty(const
SfxItemPropertySimpleEntry rEntry,
}
case RES_BACKGROUND:
{
-//
-const SfxItemSet rSet = rBase.GetItemSet();
-const SvxBrushItem
aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet));
-
-if(!aOriginalBrushItem.QueryValue(aRet, nMemberId))
+
[Libreoffice-commits] core.git: 9 commits - include/svx sc/source sd/source svx/source sw/source
include/svx/unoshape.hxx |3 -
sc/source/filter/excel/xestream.cxx |2
sc/source/filter/inc/xestream.hxx|2
sd/source/filter/eppt/epptooxml.hxx |2
sd/source/filter/eppt/pptx-epptooxml.cxx |2
sd/source/filter/ppt/pptinanimations.cxx | 64 ---
svx/source/unodraw/unoshape.cxx |7 ---
sw/source/core/access/acctable.cxx |4 -
sw/source/core/attr/format.cxx |2
sw/source/core/doc/tblrwcl.cxx | 15 ---
sw/source/core/unocore/unoparagraph.cxx |4 -
sw/source/ui/vba/vbafield.cxx|3 -
sw/source/ui/vba/vbafield.hxx|3 -
13 files changed, 42 insertions(+), 71 deletions(-)
New commits:
commit 3daa47e87ad8c51a84750676ca9b9932390dbdcf
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 11:02:12 2014 +0100
coverity#704291 Logically dead code
Change-Id: Icfdb7178ea89f2a3bd9680cf1b2c017b5058bb83
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index d35a88d..a071150 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2165,7 +2165,7 @@ void AnimationImporter::importCommandContainer( const
Atom* pAtom, const Referen
DBG_ASSERT( pAtom pAtom-getType() == DFF_msofbtAnimCommand
xCommand.is(), invalid call to
ppt::AnimationImporter::importCommandContainer()!);
if( pAtom xCommand.is() )
{
-sal_Int32 nBits = 0, nType = 0;
+sal_Int32 nBits = 0;
Any aValue;
const Atom* pChildAtom = pAtom-findFirstChildAtom();
@@ -2230,47 +2230,33 @@ void AnimationImporter::importCommandContainer( const
Atom* pAtom, const Referen
NamedValue aParamValue;
-switch( nType )
+if ( aParam == onstopaudio )
{
-case 0: // event
-case 1: // call
-if ( aParam == onstopaudio )
-{
-nCommand = EffectCommands::STOPAUDIO;
-}
-else if ( aParam == play )
-{
-nCommand = EffectCommands::PLAY;
-}
-else if( aParam.startsWith( playFrom ) )
-{
-const OUString aMediaTime( aParam.copy( 9,
aParam.getLength() - 10 ) );
-rtl_math_ConversionStatus eStatus;
-double fMediaTime = ::rtl::math::stringToDouble(
aMediaTime, (sal_Unicode)('.'), (sal_Unicode)(','), eStatus, NULL );
-if( eStatus == rtl_math_ConversionStatus_Ok )
-{
-aParamValue.Name = MediaTime;
-aParamValue.Value = fMediaTime;
-}
-nCommand = EffectCommands::PLAY;
-}
-else if ( aParam == togglePause )
-{
-nCommand = EffectCommands::TOGGLEPAUSE;
-}
-else if ( aParam == stop )
-{
-nCommand = EffectCommands::STOP;
-}
-break;
-case 2: // verb
+nCommand = EffectCommands::STOPAUDIO;
+}
+else if ( aParam == play )
+{
+nCommand = EffectCommands::PLAY;
+}
+else if( aParam.startsWith( playFrom ) )
+{
+const OUString aMediaTime( aParam.copy( 9, aParam.getLength()
- 10 ) );
+rtl_math_ConversionStatus eStatus;
+double fMediaTime = ::rtl::math::stringToDouble( aMediaTime,
(sal_Unicode)('.'), (sal_Unicode)(','), eStatus, NULL );
+if( eStatus == rtl_math_ConversionStatus_Ok )
{
-aParamValue.Name = Verb;
-aParamValue.Value = aParam.toInt32();
-
-nCommand = EffectCommands::VERB;
+aParamValue.Name = MediaTime;
+aParamValue.Value = fMediaTime;
}
-break;
+nCommand = EffectCommands::PLAY;
+}
+else if ( aParam == togglePause )
+{
+nCommand = EffectCommands::TOGGLEPAUSE;
+}
+else if ( aParam == stop )
+{
+nCommand = EffectCommands::STOP;
}
xCommand-setCommand( nCommand );
commit 4df99bdc5b4a10c9904c2ac792f9c08152419a8e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 10:58:02 2014 +0100
coverity#704352 Logically dead code
Change-Id: I97cc143071951bc24b8b0f9c6780e40a3b2bdc61
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 90a7e72..45a9fcc 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -4255,22 +4255,7 @@ bool
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - include/oox oox/source
include/oox/drawingml/textbodyproperties.hxx|1 +
include/oox/drawingml/textcharacterproperties.hxx |2 ++
oox/source/drawingml/textbodyproperties.cxx |4 ++--
oox/source/drawingml/textbodypropertiescontext.cxx |4 ++--
oox/source/drawingml/textcharacterproperties.cxx|3 +++
oox/source/drawingml/textcharacterpropertiescontext.cxx |4
oox/source/drawingml/transform2dcontext.cxx |3 ++-
7 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit 426617d4c8e8aacf5487752ddd8e5090e5bb1dd7
Author: Muthu Subramanian sumu...@collabora.com
Date: Mon Mar 31 15:36:51 2014 +0530
n#870234: Import gradfill for text colors.
Uses the first color from the gradfill list.
(Which is better than plain black!)
Ported from: cfc76de83e3c0a56abd30a8f3bd7c69d3500d223
Change-Id: I772274634c0e3ab13b7b03a5b676138999a4439a
diff --git a/include/oox/drawingml/textcharacterproperties.hxx
b/include/oox/drawingml/textcharacterproperties.hxx
index 2e519c9..00ac8e7 100644
--- a/include/oox/drawingml/textcharacterproperties.hxx
+++ b/include/oox/drawingml/textcharacterproperties.hxx
@@ -24,6 +24,7 @@
#include oox/helper/propertymap.hxx
#include oox/drawingml/color.hxx
#include oox/drawingml/textfont.hxx
+#include oox/drawingml/fillproperties.hxx
namespace oox { class PropertySet; }
@@ -53,6 +54,7 @@ struct TextCharacterProperties
OptValue bool moItalic;
OptValue bool moUnderlineLineFollowText;
OptValue bool moUnderlineFillFollowText;
+GradientFillProperties maGradientProps; /// Properties for gradient
text colors
/** Overwrites all members that are explicitly set in rSourceProps. */
voidassignUsed( const TextCharacterProperties
rSourceProps );
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index a5fe786..bbc9ca9 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -59,6 +59,7 @@ void TextCharacterProperties::assignUsed( const
TextCharacterProperties rSource
moItalic.assignIfUsed( rSourceProps.moItalic );
moUnderlineLineFollowText.assignIfUsed(
rSourceProps.moUnderlineLineFollowText );
moUnderlineFillFollowText.assignIfUsed(
rSourceProps.moUnderlineFillFollowText );
+maGradientProps.assignUsed( rSourceProps.maGradientProps );
}
void TextCharacterProperties::pushToPropMap( PropertyMap rPropMap, const
XmlFilterBase rFilter, bool bUseOptional ) const
@@ -92,6 +93,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap
rPropMap, const XmlFil
if( maCharColor.isUsed() )
rPropMap[ PROP_CharColor ] = maCharColor.getColor(
rFilter.getGraphicHelper() );
+if( maGradientProps.maGradientStops.size() 0 )
+rPropMap[ PROP_CharColor ] =
maGradientProps.maGradientStops.begin()-second.getColor(
rFilter.getGraphicHelper() );
if( moLang.has() !moLang.get().isEmpty() )
{
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 6835149..f187a80 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -151,6 +151,10 @@ Reference XFastContextHandler
TextCharacterPropertiesContext::createFastChild
case A_TOKEN( hlinkMouseOver ): // CT_Hyperlink
xRet.set( new HyperLinkContext( *this, xAttributes,
mrTextCharacterProperties.maHyperlinkPropertyMap ) );
break;
+
+case A_TOKEN( gradFill ):
+xRet.set( new GradientFillContext( *this, xAttributes,
mrTextCharacterProperties.maGradientProps ) );
+break;
}
if( !xRet.is() )
xRet.set( this );
commit 855aaddc1926df00e680afb42983ffb948e212c9
Author: Muthu Subramanian sumu...@collabora.com
Date: Mon Mar 31 15:04:31 2014 +0530
n#862510: anchorCtr controls the anchoring as well.
Ported from: c17eb67460293fbe72ffa8e80cd10743df493afa
Change-Id: I7b5885c3ac9ec30970bdb8b2c9318dc181dda5bd
diff --git a/include/oox/drawingml/textbodyproperties.hxx
b/include/oox/drawingml/textbodyproperties.hxx
index f8800be..c026b4e 100644
--- a/include/oox/drawingml/textbodyproperties.hxx
+++ b/include/oox/drawingml/textbodyproperties.hxx
@@ -34,6 +34,7 @@ struct TextBodyProperties
{
PropertyMap maPropertyMap;
OptValue sal_Int32moRotation;
+boolmbAnchorCtr;
OptValue sal_Int32moVert;
boost::optional sal_Int32 moInsets[4];
boost::optional sal_Int32 moTextOffX;
diff --git a/oox/source/drawingml/textbodyproperties.cxx
b/oox/source/drawingml/textbodyproperties.cxx
index
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/document.cxx | 101 ---
1 file changed, 32 insertions(+), 69 deletions(-)
New commits:
commit 9ae833b62956a6d86772e2d2bf83a7391f322b00
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Mar 28 20:50:29 2014 -0400
rhbz#1080196: Delete the destination first then paste.
Deleting in-between pasting was causing the block iterators to become
invalid when the deletion took place, which resulted in a segfault.
Also cleaned up the bits about handling filtered rows. It was using the
old row flag which is empty these days (so it never would have worked).
Plus we do bail out earlier if the destination contains a filtered row.
Change-Id: I78d3ee8bce1647c1c8685f92a3df3c38cc014811
(cherry picked from commit 2ec45841b97a994ef9dca854e142598a063877fd)
Reviewed-on: https://gerrit.libreoffice.org/8786
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e45bd02..90128ef 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2775,21 +2775,6 @@ void ScDocument::CopyFromClip( const ScRange
rDestRange, const ScMarkData rMar
SetAutoCalc( bOldAutoCalc );
}
-static SCROW lcl_getLastNonFilteredRow(
-const ScBitMaskCompressedArraySCROW, sal_uInt8 rFlags, SCROW nBegRow,
SCROW nEndRow,
-SCROW nRowCount)
-{
-SCROW nFilteredRow = rFlags.GetFirstForCondition(
-nBegRow, nEndRow, CR_FILTERED, CR_FILTERED);
-
-SCROW nRow = nFilteredRow - 1;
-if (nRow - nBegRow + 1 nRowCount)
-// make sure the row range stays within the data size.
-nRow = nBegRow + nRowCount - 1;
-
-return nRow;
-}
-
void ScDocument::CopyMultiRangeFromClip(
const ScAddress rDestPos, const ScMarkData rMark, sal_uInt16 nInsFlag,
ScDocument* pClipDoc,
bool bResetCut, bool bAsLink, bool /*bIncludeFiltered*/, bool
bSkipAttrForEmpty)
@@ -2801,83 +2786,62 @@ void ScDocument::CopyMultiRangeFromClip(
// There is nothing in the clip doc to copy.
return;
-bool bOldAutoCalc = GetAutoCalc();
-SetAutoCalc( false ); // avoid multiple recalculations
+// Right now, we don't allow pasting into filtered rows, so we don't even
handle it here.
+sc::AutoCalcSwitch aACSwitch(*this, false); // turn of auto calc
temporarily.
NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc);
+ScRange aDestRange;
+rMark.GetMarkArea(aDestRange);
+
+bInsertingFromOtherDoc = true; // kein Broadcast/Listener aufbauen bei
Insert
+
SCCOL nCol1 = rDestPos.Col();
SCROW nRow1 = rDestPos.Row();
ScClipParam rClipParam = pClipDoc-GetClipParam();
+if (!bSkipAttrForEmpty)
+{
+// Do the deletion first.
+sal_uInt16 nDelFlag = IDF_CONTENTS;
+SCCOL nColSize = rClipParam.getPasteColSize();
+SCROW nRowSize = rClipParam.getPasteRowSize();
+
+DeleteArea(nCol1, nRow1, nCol1+nColSize-1, nRow1+nRowSize-1, rMark,
nDelFlag);
+}
+
sc::CopyFromClipContext aCxt(*this, NULL, pClipDoc, nInsFlag, bAsLink,
bSkipAttrForEmpty);
std::pairSCTAB,SCTAB aTabRanges = getMarkedTableRange(maTabs, rMark);
aCxt.setTabRange(aTabRanges.first, aTabRanges.second);
-ScRange aDestRange;
-rMark.GetMarkArea(aDestRange);
-SCROW nLastMarkedRow = aDestRange.aEnd.Row();
-
-bInsertingFromOtherDoc = true; // kein Broadcast/Listener aufbauen bei
Insert
-
-SCROW nBegRow = nRow1;
-sal_uInt16 nDelFlag = IDF_CONTENTS;
-const ScBitMaskCompressedArraySCROW, sal_uInt8 rFlags =
GetRowFlagsArray(aCxt.getTabStart());
-
-for ( size_t i = 0, n = rClipParam.maRanges.size(); i n; ++i )
+for (size_t i = 0, n = rClipParam.maRanges.size(); i n; ++i)
{
-ScRange* p = rClipParam.maRanges[ i ];
-// The begin row must not be filtered.
+ScRange* p = rClipParam.maRanges[i];
SCROW nRowCount = p-aEnd.Row() - p-aStart.Row() + 1;
-
SCsCOL nDx = static_castSCsCOL(nCol1 - p-aStart.Col());
-SCsROW nDy = static_castSCsROW(nBegRow - p-aStart.Row());
+SCsROW nDy = static_castSCsROW(nRow1 - p-aStart.Row());
SCCOL nCol2 = nCol1 + p-aEnd.Col() - p-aStart.Col();
+SCROW nEndRow = nRow1 + nRowCount - 1;
-SCROW nEndRow = lcl_getLastNonFilteredRow(rFlags, nBegRow,
nLastMarkedRow, nRowCount);
-
-if (!bSkipAttrForEmpty)
-DeleteArea(nCol1, nBegRow, nCol2, nEndRow, rMark, nDelFlag);
+CopyBlockFromClip(aCxt, nCol1, nRow1, nCol2, nEndRow, rMark, nDx, nDy);
-CopyBlockFromClip(aCxt, nCol1, nBegRow, nCol2, nEndRow, rMark, nDx,
nDy);
-nRowCount -= nEndRow - nBegRow + 1;
-
-while (nRowCount 0)
+switch (rClipParam.meDirection)
{
-// Get the first non-filtered row.
-SCROW nNonFilteredRow =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - fpicker/source
fpicker/source/office/iodlg.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 0094a8c95c901d22fd56e9613f017fa8be3affd5
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Mar 30 12:54:05 2014 +0200
fdo#76778 fix wildcard support in File Open dialog
Change-Id: Ifbdf6847ddecc7848828247655e729dfe2299b30
Reviewed-on: https://gerrit.libreoffice.org/8791
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 009b61d..428b8e2 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2489,6 +2489,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl(
OUString rPath, OUString r
OUString aEmpty;
OUString aReversePath = comphelper::string::reverseString(rPath);
sal_Int32 nQuestionMarkPos = rPath.indexOf( '?' );
+sal_Int32 nWildCardPos = rPath.indexOf( FILEDIALOG_DEF_WILDCARD );
if ( nQuestionMarkPos != -1 )
{
@@ -2497,8 +2498,10 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl(
OUString rPath, OUString r
if ( INET_PROT_NOT_VALID != eProt INET_PROT_FILE != eProt )
nQuestionMarkPos = -1;
+
+nWildCardPos = std::min( nWildCardPos, nQuestionMarkPos );
}
-sal_Int32 nWildCardPos = std::min( rPath.indexOf( FILEDIALOG_DEF_WILDCARD
), nQuestionMarkPos );
+
rFilter = aEmpty;
if ( nWildCardPos != -1 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Bug 63905 - printing with Draw/Impress
Hi all, I've been working on fixing fdo#63905 ( https://bugs.freedesktop.org/show_bug.cgi?id=63905) and came across a comment in the code ( http://opengrok.libreoffice.org/xref/core/include/vcl/print.hxx#524) to the effect of Draw/Impress never using the page format specified in the Format - Page dialog for printing but instead using the paper size set by the printer (unlike Writer and Calc). The bug behaviour seems to back this up. I've only had a chance to test with a virtual printer so far, but changing paper size in the printer settings (as well as in Format - Page) allows the page to be printed to the correct paper size. I was wondering if anyone could shed some light on this bug and/or why this design decision was undertaken? Cheers, Eilidh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/WpftImportTestBase.cxx | 48 +++
1 file changed, 27 insertions(+), 21 deletions(-)
New commits:
commit c6821e66a66bd8fbb2c5a617e49783b7a4fc0724
Author: David Tardon dtar...@redhat.com
Date: Mon Mar 31 12:36:27 2014 +0200
speed up the import tests
Change-Id: If3f0198d58b6c64a4efd4be294f1d66fb39f2302
diff --git a/writerperfect/qa/unit/WpftImportTestBase.cxx
b/writerperfect/qa/unit/WpftImportTestBase.cxx
index 773fa3b..4a05d05 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.cxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.cxx
@@ -80,6 +80,30 @@ bool WpftImportTestBase::load(const OUString , const
OUString rURL, const OUSt
m_xDesktop-loadComponentFromURL(m_aFactoryURL, _blank, 0,
uno::Sequencebeans::PropertyValue()),
uno::UNO_QUERY_THROW);
+// Find the model and frame. We need them later.
+uno::Referenceframe::XFrame xFrame(xDoc, uno::UNO_QUERY);
+uno::Referenceframe::XModel xModel(xDoc, uno::UNO_QUERY);
+uno::Referenceframe::XController xController(xDoc, uno::UNO_QUERY);
+
+if (xFrame.is())
+{
+xController = xFrame-getController();
+xModel = xController-getModel();
+}
+else if (xModel.is())
+{
+xController = xModel-getCurrentController();
+xFrame = xController-getFrame();
+}
+else if (xController.is())
+{
+xFrame = xController-getFrame();
+xModel = xController-getModel();
+}
+
+if (!xFrame.is() || !xModel.is())
+throw uno::RuntimeException();
+
bool result = false;
// try to import the document (and load it into the prepared frame)
@@ -105,7 +129,9 @@ bool WpftImportTestBase::load(const OUString , const
OUString rURL, const OUSt
impl_detectFilterName(aDescriptor, aTypeName);
+xModel-lockControllers();
result = m_xFilter-filter(aDescriptor);
+xModel-unlockControllers();
}
catch (const uno::Exception )
{
@@ -113,29 +139,9 @@ bool WpftImportTestBase::load(const OUString , const
OUString rURL, const OUSt
}
// close the opened document
-uno::Referenceutil::XCloseable xCloseable(xDoc, uno::UNO_QUERY);
-
-if (!xCloseable.is())
-{
-uno::Referenceframe::XController xController(xDoc, uno::UNO_QUERY);
-
-if (!xController.is())
-{
-const uno::Referenceframe::XModel xModel(xDoc, uno::UNO_QUERY);
-if (xModel.is())
-xController = xModel-getCurrentController();
-}
-
-if (xController.is())
-{
-const uno::Referenceframe::XFrame xFrame =
xController-getFrame();
-if (xFrame.is())
-xCloseable.set(xFrame, uno::UNO_QUERY);
-}
-}
-
try
{
+uno::Referenceutil::XCloseable xCloseable(xFrame, uno::UNO_QUERY);
if (xCloseable.is())
xCloseable-close(true);
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools solenv/gbuild tools/Library_tl.mk tools/source vcl/inc vcl/source
include/tools/debug.hxx | 145 ---
include/tools/tools.h| 31 --
solenv/gbuild/CppunitTest.mk |5
solenv/gbuild/JunitTest.mk |5
tools/Library_tl.mk |1
tools/source/debug/debug.cxx | 502 ---
tools/source/generic/bigint.cxx |1
tools/source/generic/toolsin.cxx | 34 --
vcl/inc/dbggui.hxx | 10
vcl/inc/pch/precompiled_vcl.hxx |2
vcl/inc/svdata.hxx |1
vcl/source/app/dbggui.cxx| 484 -
vcl/source/app/svapp.cxx |1
vcl/source/app/svmain.cxx| 12
vcl/source/app/svmainhook.cxx|2
15 files changed, 18 insertions(+), 1218 deletions(-)
New commits:
commit 747631f26c90f5077da5628a32fc642aaea8167d
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 31 12:34:17 2014 +0200
Remove now unused obsolete tools/debug.hxx functionality
Change-Id: I1bc585af8f0189dfa219bd42a5f09871a006c6ea
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index 2583d7f3..62c40e0 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -40,114 +40,26 @@
#ifdef DBG_UTIL
-typedef void (*DbgPrintLine)( const sal_Char* pLine );
-typedef const sal_Char* (*DbgUsr)(const void* pThis );
typedef void (*DbgTestSolarMutexProc)();
-#define DBG_BUF_MAXLEN 16384
-
#define DBG_TEST_RESOURCE (0x0200)
#define DBG_TEST_DIALOG (0x0400)
#define DBG_TEST_BOLDAPPFONT(0x0800)
-#define DBG_OUT_NULL0
-#define DBG_OUT_FILE1
-#define DBG_OUT_WINDOW 2
-#define DBG_OUT_SHELL 3
-#define DBG_OUT_MSGBOX 4
-#define DBG_OUT_TESTTOOL5
-#define DBG_OUT_DEBUGGER6
-#define DBG_OUT_ABORT 7
-
-#define DBG_OUT_COUNT 8
-
-// user (runtime) defined output channels
-#define DBG_OUT_USER_CHANNEL_0100
-
struct DbgData
{
sal_uIntPtr nTestFlags;
-bool bOverwrite;
-sal_uIntPtr nErrorOut;
-sal_CharaDebugName[260];
-sal_CharaInclFilter[512];
-sal_CharaExclFilter[512];
-sal_CharaInclClassFilter[512];
-sal_CharaExclClassFilter[512];
sal_CharaDbgWinState[50]; // DbgGUIData for VCL
};
-struct DbgDataType
-{
-void* pData;
-sal_Char const * pName;
-};
-
// Dbg prototypes
-#define DBG_FUNC_DEBUGSTART 1
-#define DBG_FUNC_DEBUGEND 2
-#define DBG_FUNC_GETDATA4
-#define DBG_FUNC_SAVEDATA 5
-#define DBG_FUNC_SETPRINTMSGBOX 6
-#define DBG_FUNC_SETPRINTWINDOW 7
-#define DBG_FUNC_COREDUMP 12
-#define DBG_FUNC_ALLERROROUT13
-#define DBG_FUNC_SETTESTSOLARMUTEX 14
-#define DBG_FUNC_TESTSOLARMUTEX 15
-#define DBG_FUNC_PRINTFILE 16
-#define DBG_FUNC_SET_ABORT 20
+#define DBG_FUNC_GETDATA0
+#define DBG_FUNC_SAVEDATA 1
+#define DBG_FUNC_SETTESTSOLARMUTEX 2
+#define DBG_FUNC_TESTSOLARMUTEX 3
TOOLS_DLLPUBLIC void* DbgFunc( sal_uInt16 nAction, void* pData = NULL );
-inline void DbgDebugStart()
-{
-DbgFunc( DBG_FUNC_DEBUGSTART );
-}
-
-inline void DbgDebugEnd()
-{
-DbgFunc( DBG_FUNC_DEBUGEND );
-}
-
-inline void DbgSetPrintMsgBox( DbgPrintLine pProc )
-{
-DbgFunc( DBG_FUNC_SETPRINTMSGBOX, (void*)(long)pProc );
-}
-
-inline void DbgSetPrintWindow( DbgPrintLine pProc )
-{
-DbgFunc( DBG_FUNC_SETPRINTWINDOW, (void*)(long)pProc );
-}
-
-inline void DbgSetAbort( DbgPrintLine pProc )
-{
-DbgFunc( DBG_FUNC_SET_ABORT, (void*)(long)pProc );
-}
-
-typedef sal_uInt16 DbgChannelId;
-
-/** registers a user-defined channel for emitting the diagnostic messages
-
-Note that such a user-defined channel cannot be revoked during the lifetime
-of the process. Thus, it's the caller's responsibility to ensure that the
-procedure to which -pProc points remains valid.
-
-@param pProc
-the function for emitting the diagnostic messages
-@return
-a unique number for this channel, which can be used for
-DbgData::nErrorOut
-@see DBG_OUT_USER_CHANNEL_0
-
-(In theory, this function could replace the other hard-coded channels.
Well, at least
-the ones for MsgBox, Window, Shell, TestTool. Perhaps in the next life ...)
-*/
-TOOLS_DLLPUBLIC DbgChannelId DbgRegisterUserChannel( DbgPrintLine pProc );
-
-inline bool DbgIsAllErrorOut()
-{
-return (DbgFunc( DBG_FUNC_ALLERROROUT ) != 0);
-}
-
inline DbgData* DbgGetData()
{
return (DbgData*)DbgFunc( DBG_FUNC_GETDATA );
@@ -158,15 +70,6 @@ inline void DbgSaveData( const DbgData rData )
DbgFunc( DBG_FUNC_SAVEDATA, (void*)rData );
}
-inline sal_uIntPtr DbgGetErrorOut() // Testtool: test whether to collect
OSL_ASSERTions as well
-{
-DbgData* pData = DbgGetData();
-if ( pData )
-return
[Libreoffice-commits] core.git: sal/cppunittester
sal/cppunittester/cppunittester.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dc9feb69f86b7c8e4f7b52ea6b4a18abd64b036b
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 31 13:35:02 2014 +0200
Move invariant writes outside loop
Change-Id: Ia254fe382a00be13a631fcc1b23f940352d8d3ba
diff --git a/sal/cppunittester/cppunittester.cxx
b/sal/cppunittester/cppunittester.cxx
index 0f4d58a..c2bdb13 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -115,9 +115,9 @@ public:
{
tn[i] = '_';
}
-tn[len] = '_';
-tn[len + 1] = 0;
}
+tn[len] = '_';
+tn[len + 1] = 0;
setenv(LO_TESTNAME, tn, true);
delete[] tn;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source writerfilter/source
oox/source/core/xmlfilterbase.cxx|1 +
writerfilter/source/dmapper/BorderHandler.hxx|1 +
writerfilter/source/dmapper/CellColorHandler.hxx |1 +
writerfilter/source/dmapper/CellMarginHandler.hxx|1 +
writerfilter/source/dmapper/FFDataHandler.hxx|1 +
writerfilter/source/dmapper/LatentStyleHandler.hxx |1 +
writerfilter/source/dmapper/MeasureHandler.hxx |1 +
writerfilter/source/dmapper/SectionColumnHandler.hxx |2 +-
8 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 80932c9e27c9be592be8efca0ce637f09a158e2e
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Mar 30 14:47:23 2014 -0400
oox, writerfilter: add missing headers for C++ containers
Change-Id: Ied05627a0b5fdb8e5fd4a1b071ce32d901f07961
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index b8fcfdb..bb8e114 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -20,6 +20,7 @@
#include oox/core/xmlfilterbase.hxx
#include cstdio
+#include set
#include com/sun/star/container/XNameContainer.hpp
#include com/sun/star/embed/XRelationshipAccess.hpp
#include com/sun/star/xml/sax/InputSource.hpp
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx
b/writerfilter/source/dmapper/BorderHandler.hxx
index f00b5b3..dda5828 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_BORDERHANDLER_HXX
#define INCLUDED_BORDERHANDLER_HXX
+#include vector
#include WriterFilterDllApi.hxx
#include resourcemodel/LoggedResources.hxx
#include boost/shared_ptr.hpp
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx
b/writerfilter/source/dmapper/CellColorHandler.hxx
index 4ba0ba8..8ee753d 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -22,6 +22,7 @@
#include WriterFilterDllApi.hxx
#include resourcemodel/LoggedResources.hxx
#include boost/shared_ptr.hpp
+#include vector
#include com/sun/star/beans/PropertyValue.hpp
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx
b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 34f758f..533f757 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -22,6 +22,7 @@
#include WriterFilterDllApi.hxx
#include resourcemodel/LoggedResources.hxx
#include boost/shared_ptr.hpp
+#include vector
#include com/sun/star/beans/PropertyValue.hpp
namespace writerfilter {
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx
b/writerfilter/source/dmapper/FFDataHandler.hxx
index 31e1a17..1c722e6 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_FFDataHandler_HXX
#include resourcemodel/LoggedResources.hxx
#include rtl/ustring.hxx
+#include vector
namespace writerfilter {
namespace dmapper {
class FFDataHandler : public LoggedProperties
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx
b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index edb78e3..62b830a 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -11,6 +11,7 @@
#include resourcemodel/LoggedResources.hxx
#include boost/shared_ptr.hpp
+#include vector
#include com/sun/star/beans/PropertyValue.hpp
namespace writerfilter
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx
b/writerfilter/source/dmapper/MeasureHandler.hxx
index acba84c..09ea006 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -22,6 +22,7 @@
#include WriterFilterDllApi.hxx
#include resourcemodel/LoggedResources.hxx
#include boost/shared_ptr.hpp
+#include vector
#include com/sun/star/beans/PropertyValue.hpp
namespace writerfilter {
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx
b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index 77bbaf6..9378724 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -22,7 +22,7 @@
#include WriterFilterDllApi.hxx
#include resourcemodel/LoggedResources.hxx
#include boost/shared_ptr.hpp
-
+#include vector
namespace writerfilter {
namespace dmapper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: smoketest/CppunitTest_smoketest.mk solenv/gbuild
smoketest/CppunitTest_smoketest.mk |2 -- solenv/gbuild/CppunitTest.mk |7 --- 2 files changed, 9 deletions(-) New commits: commit b5a680c5de114dd6d0ea4ab29715c2bcff2b1ec4 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 31 13:43:34 2014 +0200 SAL_DIAGNOSE_ABORT is no longer used Change-Id: I87090e2714bca3ea7a9ad8a8ff966702139ba345 diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 5909c30..d245290 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -10,8 +10,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,smoketest)) -$(eval $(call gb_CppunitTest_abort_on_assertion,smoketest)) - $(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\ smoketest/smoketest_too \ )) diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 9b012bc..7d2b602 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -77,7 +77,6 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) ($(gb_CppunitTest_CPPTESTPRECOMMAND) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ - $(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \ $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \ $(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktarget,$*)) \ $(call gb_CppunitTest__make_args) \ @@ -118,18 +117,12 @@ $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS := $(call gb_CppunitTest_get_target,$(1)) : URE := $(false) $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES := $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES := -$(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT := $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1 $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest) endef -define gb_CppunitTest_abort_on_assertion -$(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT := TRUE - -endef - # Add additional command line arguments for the test. # # You should practically never need to use this, as there are special ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/uiconfig
vcl/uiconfig/ui/printerdevicepage.ui | 84 ++- 1 file changed, 45 insertions(+), 39 deletions(-) New commits: commit 93657bdb7b0f20cb2d868bac024a0f042a9a90cb Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 31 12:49:44 2014 +0100 add mnemonic widgets Change-Id: I0646927ea73b4bb69bd912d3cc5dfbdafad53aa4 diff --git a/vcl/uiconfig/ui/printerdevicepage.ui b/vcl/uiconfig/ui/printerdevicepage.ui index 45dc0958..2102d6d 100644 --- a/vcl/uiconfig/ui/printerdevicepage.ui +++ b/vcl/uiconfig/ui/printerdevicepage.ui @@ -1,6 +1,41 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ + object class=GtkListStore id=liststore1 +columns + !-- column-name gchararray1 -- + column type=gchararray/ + !-- column-name gint1 -- + column type=gint/ +/columns +data + row +col id=0 translatable=yesAutomatic : %s/col +col id=10/col + /row + row +col id=0 translatable=yesPostScript (Level from driver)/col +col id=11/col + /row + row +col id=0 translatable=yesPostScript Level 1/col +col id=12/col + /row + row +col id=0 translatable=yesPostScript Level 2/col +col id=13/col + /row + row +col id=0 translatable=yesPostScript Level 3/col +col id=14/col + /row + row +col id=0 translatable=yesPDF/col +col id=110/col + /row +/data + /object object class=GtkGrid id=PrinterDevicePage property name=visibleTrue/property property name=can_focusFalse/property @@ -17,6 +52,7 @@ property name=xalign0/property property name=label translatable=yes_Option/property property name=use_underlineTrue/property +property name=mnemonic_widgetoptions:border/property attributes attribute name=weight value=bold/ /attributes @@ -35,6 +71,7 @@ property name=xalign0/property property name=label translatable=yesCurrent _value/property property name=use_underlineTrue/property +property name=mnemonic_widgetvalues:border/property attributes attribute name=weight value=bold/ /attributes @@ -53,6 +90,7 @@ property name=xalign0/property property name=label translatable=yesPrinter _Language type/property property name=use_underlineTrue/property +property name=mnemonic_widgetlevel/property /object packing property name=left_attach0/property @@ -68,6 +106,7 @@ property name=xalign0/property property name=label translatable=yes_Color/property property name=use_underlineTrue/property +property name=mnemonic_widgetcolorspace/property /object packing property name=left_attach0/property @@ -83,6 +122,7 @@ property name=xalign0/property property name=label translatable=yesColor _depth/property property name=use_underlineTrue/property +property name=mnemonic_widgetcolordepth/property /object packing property name=left_attach0/property @@ -95,8 +135,6 @@ object class=GtkComboBoxText id=colorspace property name=visibleTrue/property property name=can_focusFalse/property -property name=entry_text_column0/property -property name=id_column1/property items item translatable=yesFrom driver/item item translatable=yesColor/item @@ -114,8 +152,6 @@ object class=GtkComboBoxText id=colordepth property name=visibleTrue/property property name=can_focusFalse/property -property name=entry_text_column0/property -property name=id_column1/property items item translatable=yes8 Bit/item item translatable=yes24 Bit/item @@ -145,6 +181,8 @@ object class=GtkTreeView id=options:border property name=visibleTrue/property property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property child internal-child=selection object class=GtkTreeSelection id=treeview-selection1/ /child @@ -160,6 +198,8 @@ object class=GtkTreeView id=values:border property name=visibleTrue/property property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property child internal-child=selection object class=GtkTreeSelection id=treeview-selection2/ /child @@ -172,38 +212,4 @@ /packing /child /object - object class=GtkListStore id=liststore1 -columns - !-- column-name gchararray1 -- - column type=gchararray/ - !-- column-name gint1 -- - column type=gint/ -/columns -
Re: Fixing Bug 46200 [Easy Hack]
Hi Tharindu, On Sunday, 2014-03-30 11:13:13 +0530, Tharindu Amila Perera wrote: 1] ScTabViewShell::KeyInput as the starting point to capture the event the keyinput function decl is found at tabvwsh.hxx. But I cannot seem to find a place it has been used for reference. used in the sense of where it is called? ScTabViewShell is derived from SfxViewShell and the virtual KeyInput() method is called via the sfx2 framework whenever a key is pressed. I would like to know which source file contains the code to handle keyboard events in a spreadsheet. The actual code handling these key events is in sc/source/ui/view/tabvwsh4.cxx ScTabViewShell::TabKeyInput() Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpGc4gZudR4D.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: soltools/cpp sw/source
soltools/cpp/_eval.c | 12 ++--
sw/source/core/frmedt/tblsel.cxx |2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 1cc318bfe68d89015d8aa0d98e5e94fe72ec892a
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 31 14:58:59 2014 +0200
Typo #elsif - #elif
Change-Id: I95d4dc2a3364172e8917d0a029564e9114943148
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
index 22cb9ad..f10fa79 100644
--- a/soltools/cpp/_eval.c
+++ b/soltools/cpp/_eval.c
@@ -313,7 +313,7 @@ long
*op++ = UMINUS;
if (tp-type == STAR || tp-type == AND)
{
-error(ERROR, Illegal operator * or in #if/#elsif);
+error(ERROR, Illegal operator * or in #if/#elif);
return 0;
}
continue;
@@ -380,7 +380,7 @@ long
/* fall through */
default:
-error(ERROR, Bad operator (%t) in #if/#elsif, tp);
+error(ERROR, Bad operator (%t) in #if/#elif, tp);
return 0;
}
}
@@ -390,14 +390,14 @@ long
return 0;
if (op != ops[1] || vp != vals[1])
{
-error(ERROR, Botch in #if/#elsif);
+error(ERROR, Botch in #if/#elif);
return 0;
}
if (vals[0].type == UND)
error(ERROR, Undefined expression value);
return vals[0].val;
syntax:
-error(ERROR, Syntax error in #if/#elsif);
+error(ERROR, Syntax error in #if/#elif);
return 0;
}
@@ -679,7 +679,7 @@ struct value
else
{
error(ERROR,
- Bad number %t in #if/#elsif, tp);
+ Bad number %t in #if/#elif, tp);
break;
}
}
@@ -761,7 +761,7 @@ struct value
break;
case STRING:
-error(ERROR, String in #if/#elsif);
+error(ERROR, String in #if/#elif);
break;
}
return v;
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index f0a7423..e822758 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -1181,7 +1181,7 @@ void GetMergeSel( const SwPaM rPam, SwSelBoxes rBoxes,
pUndo-SaveCollection( *aPosArr[ i ].pSelBox );
aPosArr.Remove( nSttPos, n - nSttPos );
}
-#elsif defined( DEL_EMPTY_BOXES_AT_START_AND_END )
+#elif defined( DEL_EMPTY_BOXES_AT_START_AND_END )
nWidth = pFirstBox-GetFrmFmt()-GetFrmSize().GetWidth();
sal_uInt16 n, nSttPos = 0, nSEndPos = 0, nESttPos = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/CppunitTest_sal_rtl_oustring.mk
sal/CppunitTest_sal_rtl_oustring.mk |4 1 file changed, 4 insertions(+) New commits: commit c184d9fe120653630ecd450e96e8ceab6fdc Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 31 15:00:52 2014 +0200 Missing dependency Change-Id: I4e2444113871376c5ba134c523752e08812e70d9 diff --git a/sal/CppunitTest_sal_rtl_oustring.mk b/sal/CppunitTest_sal_rtl_oustring.mk index 196a3f5..493c644 100644 --- a/sal/CppunitTest_sal_rtl_oustring.mk +++ b/sal/CppunitTest_sal_rtl_oustring.mk @@ -23,4 +23,8 @@ $(eval $(call gb_CppunitTest_set_include,sal_rtl_oustring,\ $$(INCLUDE) \ )) +# The test uses O(U)String capabilities that dlopen this lib: +$(call gb_CppunitTest_get_target,sal_rtl_oustring) : \ +$(call gb_Library_get_target,sal_textenc) + # vim: set noet 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: include/svx svx/source
include/svx/sdr/event/eventhandler.hxx| 132 --
svx/source/inc/eventhandler.hxx | 132 ++
svx/source/sdr/contact/objectcontact.cxx |5
svx/source/sdr/contact/objectcontactofpageview.cxx|5
svx/source/sdr/contact/viewcontactofgraphic.cxx |3
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx |4
svx/source/sdr/event/eventhandler.cxx |4
7 files changed, 137 insertions(+), 148 deletions(-)
New commits:
commit 7eef30b03e6c854edc6e3c23ea2c73910291fcdf
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 16:13:14 2014 +0300
No need for svx/sdr/event/eventhandler.hxx to be public
Only used inside svx so move there.
Change-Id: I91a4b1964edab589ec8542255a2ca611f0d903a2
diff --git a/include/svx/sdr/event/eventhandler.hxx
b/svx/source/inc/eventhandler.hxx
similarity index 100%
rename from include/svx/sdr/event/eventhandler.hxx
rename to svx/source/inc/eventhandler.hxx
diff --git a/svx/source/sdr/contact/objectcontact.cxx
b/svx/source/sdr/contact/objectcontact.cxx
index 1d3dca6..259aea7 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -22,16 +22,13 @@
#include svx/sdr/contact/viewobjectcontact.hxx
#include svx/svdpage.hxx
#include svx/sdr/contact/viewcontact.hxx
-#include svx/sdr/event/eventhandler.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include svx/sdr/animation/objectanimator.hxx
-
+#include eventhandler.hxx
using namespace com::sun::star;
-
-
namespace sdr
{
namespace contact
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index ff31f90..76f7d05 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -26,7 +26,6 @@
#include svx/svdview.hxx
#include svx/sdr/contact/viewcontact.hxx
#include svx/sdr/animation/objectanimator.hxx
-#include svx/sdr/event/eventhandler.hxx
#include svx/sdrpagewindow.hxx
#include svx/sdrpaintwindow.hxx
#include basegfx/matrix/b2dhommatrix.hxx
@@ -35,12 +34,10 @@
#include drawinglayer/processor2d/processor2dtools.hxx
#include svx/unoapi.hxx
-
+#include eventhandler.hxx
using namespace com::sun::star;
-
-
namespace sdr
{
namespace contact
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx
b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index a5d6572..4ec7825 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -27,7 +27,6 @@
#include svx/sdr/contact/displayinfo.hxx
#include svx/sdr/contact/viewobjectcontact.hxx
#include svx/sdr/contact/objectcontact.hxx
-#include svx/sdr/event/eventhandler.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
#include svx/svdstr.hrc
@@ -46,7 +45,7 @@
#include basegfx/matrix/b2dhommatrixtools.hxx
#include drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
-
+#include eventhandler.hxx
namespace sdr
{
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 4b22432..037e8c5 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -17,16 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include svx/sdr/contact/viewobjectcontactofgraphic.hxx
#include svx/sdr/contact/viewcontactofgraphic.hxx
-#include svx/sdr/event/eventhandler.hxx
#include svx/svdograf.hxx
#include svx/sdr/contact/objectcontact.hxx
#include svx/svdmodel.hxx
#include svx/svdpage.hxx
-
+#include eventhandler.hxx
namespace sdr
{
diff --git a/svx/source/sdr/event/eventhandler.cxx
b/svx/source/sdr/event/eventhandler.cxx
index 0c31a9d..cf9b2f5 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -17,15 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include svx/sdr/event/eventhandler.hxx
+#include eventhandler.hxx
// for SOLARIS compiler include of algorithm part of _STL is necessary to
// get access to basic algos like ::std::find
#include algorithm
#include tools/debug.hxx
-
-
namespace sdr
{
namespace event
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/inc/eventhandler.hxx | 29 +
1 file changed, 5 insertions(+), 24 deletions(-)
New commits:
commit 0f492c419be2110937d3116f5c86c026d733f797
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 16:19:33 2014 +0300
Cosmetics
Change-Id: Ibda0c9b7ef68f040af2459ceb7328e5641f21446
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index 36b27a1..3c7670c 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -17,17 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
-#define INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_EVENTHANDLER_HXX
+#define INCLUDED_SVX_SOURCE_INC_EVENTHANDLER_HXX
#include sal/types.h
#include vector
#include vcl/timer.hxx
-
-// predeclarations
-
namespace sdr
{
namespace event
@@ -35,13 +32,10 @@ namespace sdr
class BaseEvent;
class EventHandler;
-// typedefs for a list of BaseEvents
typedef ::std::vector BaseEvent* BaseEventVector;
} // end of namespace event
} // end of namespace sdr
-
-
namespace sdr
{
namespace event
@@ -49,13 +43,11 @@ namespace sdr
class BaseEvent
{
// the EventHandler this event is registered at
-EventHandler mrEventHandler;
+EventHandler mrEventHandler;
public:
-// basic constructor.
BaseEvent(EventHandler rEventHandler);
-// destructor
virtual ~BaseEvent();
// the called method if the event is triggered
@@ -64,15 +56,13 @@ namespace sdr
} // end of namespace event
} // end of namespace sdr
-
-
namespace sdr
{
namespace event
{
class EventHandler
{
-BaseEventVector maVector;
+BaseEventVector maVector;
// to allow BaseEvents to use the add/remove functionality
friend class BaseEvent;
@@ -86,23 +76,18 @@ namespace sdr
BaseEvent* GetEvent();
public:
-// basic constructor.
EventHandler();
-// destructor
virtual ~EventHandler();
// Trigger and consume the events
virtual void ExecuteEvents();
-// for control
bool IsEmpty() const;
};
} // end of namespace event
} // end of namespace sdr
-
-
namespace sdr
{
namespace event
@@ -110,10 +95,8 @@ namespace sdr
class TimerEventHandler : public EventHandler, public Timer
{
public:
-// basic constructor.
TimerEventHandler(sal_uInt32 nTimeout = 1L);
-// destructor
virtual ~TimerEventHandler();
// The timer when it is triggered; from class Timer
@@ -125,8 +108,6 @@ namespace sdr
} // end of namespace event
} // end of namespace sdr
-
-
-#endif // INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_EVENTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/strtmpl.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 53851801c62185541ccbee4421f9327b225771a2 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 31 14:33:26 2014 +0100 coverity#983373 Dereference before null check Change-Id: Ie2a6b5e71f76ff2900ff078fcc098e66927458ef diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx index 9576096..c3d42c4 100644 --- a/sal/rtl/strtmpl.cxx +++ b/sal/rtl/strtmpl.cxx @@ -1364,9 +1364,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( ensureCapacity )( IMPL_RTL_STRINGDATA** ppThi *ppThis = pTempStr; RTL_LOG_STRING_NEW( *ppThis ); -/* must be done last, if pStr == *ppThis */ -if ( pOrg ) -IMPL_RTL_STRINGNAME( release )( pOrg ); +IMPL_RTL_STRINGNAME( release )( pOrg ); } /* --- */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/qa sw/source
sw/inc/unobrushitemhelper.hxx |7 ++-
sw/qa/extras/rtfexport/rtfexport.cxx |3 ---
sw/source/core/attr/format.cxx| 10 +-
sw/source/core/unocore/unobrushitemhelper.cxx |4
sw/source/core/unocore/unoframe.cxx | 10 +-
sw/source/core/unocore/unostyle.cxx |6 +++---
sw/source/filter/ww8/ww8atr.cxx | 20
7 files changed, 43 insertions(+), 17 deletions(-)
New commits:
commit ebf960960a69c1edb5da1994c330becac44d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 31 15:29:11 2014 +0200
sw: put getSvx* and setSvx* to a namespace, now that these are public
Change-Id: Iea2f6af83382608e4a36dd2e5803cbb936b78058
diff --git a/sw/inc/unobrushitemhelper.hxx b/sw/inc/unobrushitemhelper.hxx
index fa66383..9de5604 100644
--- a/sw/inc/unobrushitemhelper.hxx
+++ b/sw/inc/unobrushitemhelper.hxx
@@ -23,10 +23,14 @@
#include swdllapi.h
#include editeng/brushitem.hxx
+namespace sw {
+
// helper function definintions for UNO API fallbacks to replace
SvxBrushItem
void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem rBrush,
SfxItemSet rToSet);
SW_DLLPUBLIC SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet
rSourceSet, sal_Bool bSearchInParents = sal_True);
+} // namespace sw
+
#endif // _UNOBRUSHITEMHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index ded0649..776827c 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -396,7 +396,7 @@ const SfxPoolItem SwFmt::GetFmtAttr( sal_uInt16 nWhich,
sal_Bool bInParents ) c
// fill the local static SvxBrushItem from the current ItemSet so that
// the fill attributes [XATTR_FILL_FIRST .. XATTR_FILL_LAST] are used
// as good as possible to create a fallback representation and return
that
-aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, bInParents);
+aSvxBrushItem = sw::getSvxBrushItemFromSourceSet(aSet, bInParents);
return aSvxBrushItem;
}
@@ -421,7 +421,7 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich,
sal_Bool bSrchInParent, con
// to and return as state that it is set
static SvxBrushItem aSvxBrushItem(RES_BACKGROUND);
-aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, bSrchInParent);
+aSvxBrushItem = sw::getSvxBrushItemFromSourceSet(aSet,
bSrchInParent);
*ppItem = aSvxBrushItem;
return SFX_ITEM_SET;
@@ -459,7 +459,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem rAttr )
// fill a local ItemSet with the attributes corresponding as good as
possible
// to the new fill properties [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
and set these
// as ItemSet
-setSvxBrushItemAsFillAttributesToTargetSet(rSource, aTempSet);
+sw::setSvxBrushItemAsFillAttributesToTargetSet(rSource, aTempSet);
if(IsModifyLocked())
{
@@ -553,7 +553,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet rSet )
// fill attribute ranges [XATTR_FILL_FIRST .. XATTR_FILL_LAST].
Add the attributes
// corresponding as good as possible to the new fill properties
and set the whole ItemSet
const SvxBrushItem rSource(static_cast const SvxBrushItem
(*pSource));
-setSvxBrushItemAsFillAttributesToTargetSet(rSource, aTempSet);
+sw::setSvxBrushItemAsFillAttributesToTargetSet(rSource, aTempSet);
if(IsModifyLocked())
{
@@ -782,7 +782,7 @@ const SvxBrushItem SwFmt::GetBackground(sal_Bool bInP)
const
// fill the local static SvxBrushItem from the current ItemSet so that
// the fill attributes [XATTR_FILL_FIRST .. XATTR_FILL_LAST] are used
// as good as possible to create a fallback representation and return
that
-aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, bInP);
+aSvxBrushItem = sw::getSvxBrushItemFromSourceSet(aSet, bInP);
return aSvxBrushItem;
}
diff --git a/sw/source/core/unocore/unobrushitemhelper.cxx
b/sw/source/core/unocore/unobrushitemhelper.cxx
index 07a6e69..ebf9a94 100644
--- a/sw/source/core/unocore/unobrushitemhelper.cxx
+++ b/sw/source/core/unocore/unobrushitemhelper.cxx
@@ -38,6 +38,8 @@
#include svx/xfltrit.hxx
#include svx/xflhtit.hxx
+namespace sw {
+
//
void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem rBrush,
SfxItemSet rToSet)
{
@@ -304,4 +306,6 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet
rSourceSet, sal_Bool
return aRetval;
}
+} // namespace sw
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 37bcb3d..b77266a 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev3.cxx | 40 +++-
1 file changed, 23 insertions(+), 17 deletions(-)
New commits:
commit ea7102c93c33884a68d4dba0de7d52f8ed4f4579
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Tue Mar 25 21:54:20 2014 +1100
fdo#74702 OutputDevice::ImplInitFontList() fails if no fonts on device
It makes no sense that ImplInitFontList() only fails for Window
instances. I have carefully checked all the functions that use
this function, and there are no good cases when no fonts won't cause
problems. In fact, we have a number of functions that specifically
rely on the fact that ImplInitFontList will populate
OutputDevice::mpFontCollection with at least one font.
Therefore, I'm making this abort if it can't populate the collection,
regardless of whether it is a Window, Printer or VirtualDevice.
I have also refactored GetDefaultDevice - I now check the default
pOutDev parameter to see if it is NULL (the default), in which case
it is referring to the default window, so I call on
Application::GetDefaultDevice() instead of going straight to the
pimpl data structure used by the Application class.
Change-Id: I2861521d876d776d7862fc4a7ec56b7acf818789
Reviewed-on: https://gerrit.libreoffice.org/8741
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 093da2f..6e22bd3 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -451,16 +451,22 @@ void ImplFontSubstitute( OUString rFontName )
Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang,
sal_uLong nFlags, const OutputDevice*
pOutDev )
{
+if (!pOutDev) // default is NULL
+pOutDev = Application::GetDefaultDevice();
+
LanguageTag aLanguageTag(
( eLang == LANGUAGE_NONE || eLang == LANGUAGE_SYSTEM || eLang ==
LANGUAGE_DONTKNOW ) ?
Application::GetSettings().GetUILanguageTag() :
LanguageTag( eLang ));
utl::DefaultFontConfiguration rDefaults =
utl::DefaultFontConfiguration::get();
-OUString aSearch = rDefaults.getUserInterfaceFont( aLanguageTag ); //
ensure a fallback
OUString aDefault = rDefaults.getDefaultFont( aLanguageTag, nType );
+OUString aSearch;
+
if( !aDefault.isEmpty() )
aSearch = aDefault;
+else
+aSearch = rDefaults.getUserInterfaceFont( aLanguageTag ); // use the
UI font as a fallback
Font aFont;
aFont.SetPitch( PITCH_VARIABLE );
@@ -552,11 +558,9 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType,
LanguageType eLang,
{
if ( nFlags DEFAULTFONT_FLAGS_ONLYONE )
{
-
-if( !pOutDev )
-pOutDev = (const OutputDevice
*)ImplGetSVData()-mpDefaultWin;
if( !pOutDev )
{
+SAL_WARN (vcl.gdi, No default window has been set for
the application - we really shouldn't be able to get here);
sal_Int32 nIndex = 0;
aFont.SetName( aSearch.getToken( 0, ';', nIndex ) );
}
@@ -1186,26 +1190,28 @@ bool OutputDevice::ImplIsUnderlineAbove( const Font
rFont )
void OutputDevice::ImplInitFontList() const
{
-if( ! mpFontCollection-Count() )
+if( !mpFontCollection-Count() )
{
if( mpGraphics || ImplGetGraphics() )
{
SAL_INFO( vcl.gdi, OutputDevice::ImplInitFontList() );
mpGraphics-GetDevFontList( mpFontCollection );
+
+// There is absolutely no way there should be no fonts available
on the device
+if( !mpFontCollection-Count() )
+{
+OUString aError( Application error: no fonts and no vcl
resource found on your system );
+ResMgr* pMgr = ImplGetResMgr();
+if( pMgr )
+{
+OUString aResStr(ResId(SV_ACCESSERROR_NO_FONTS,
*pMgr).toString());
+if( !aResStr.isEmpty() )
+aError = aResStr;
+}
+Application::Abort( aError );
+}
}
}
-if( meOutDevType == OUTDEV_WINDOW ! mpFontCollection-Count() )
-{
-OUString aError( Application error: no fonts and no vcl resource
found on your system );
-ResMgr* pMgr = ImplGetResMgr();
-if( pMgr )
-{
-OUString aResStr(ResId(SV_ACCESSERROR_NO_FONTS, *pMgr).toString());
-if( !aResStr.isEmpty() )
-aError = aResStr;
-}
-Application::Abort( aError );
-}
}
void OutputDevice::ImplInitFont() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/dispatch.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit dcc8c9173d76c3f31af6b1098d920c5491ed150e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 31 16:17:31 2014 +0200
SAL_WARN - SAL_INFO in SfxDispatcher::_FillState()
These warnings were hidden so far, don't make them noise till one starts
to actually fix them.
Change-Id: I142726d54fbc20c1c5591a5b20d26356986ba4b8
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 691166c..9ab086f 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2101,9 +2101,8 @@ bool SfxDispatcher::_FillState
if ( !IsInvalidItem(pItem) !pItem-ISA(SfxVoidItem) )
{
sal_uInt16 nSlotId =
rState.GetPool()-GetSlotId(pItem-Which());
-SAL_WARN_IF(
-!pItem-IsA(pIF-GetSlot(nSlotId)-GetType()-Type()),
-sfx.control,
+if (!pItem-IsA(pIF-GetSlot(nSlotId)-GetType()-Type()))
+SAL_INFO(sfx.control,
item-type unequal to IDL (= no BASIC) with SID:
nSlotId in pIF-GetClassName());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/generic vcl/inc vcl/source vcl/uiconfig vcl/unx
include/vcl/ppdparser.hxx | 13 +++
vcl/generic/print/prtsetup.cxx| 39 +++---
vcl/generic/print/prtsetup.hxx|4 +++
vcl/inc/svids.hrc |1
vcl/source/src/print.src |5
vcl/uiconfig/ui/printerdevicepage.ui | 37 +++-
vcl/unx/generic/printer/cupsmgr.cxx | 10 ++--
vcl/unx/generic/printer/ppdparser.cxx | 19
8 files changed, 104 insertions(+), 24 deletions(-)
New commits:
commit a13362ef97d7cb7216009fe7002a050516895cb4
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 15:41:42 2014 +0100
Resolves: fdo#43049 basic PPD custom options support
because this is another way seen in the wild to transmit a fax number
through
cups as an alternative to using fax4CUPS
Change-Id: I32db38aa05213e469442136eb46d0028098a8b7e
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 9ac90ce..217340b 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -42,9 +42,14 @@ enum PPDValueType { eInvocation, eQuoted, eSymbol, eString,
eNo };
struct VCL_DLLPUBLIC PPDValue
{
-PPDValueTypem_eType;
-OUStringm_aOption;
-OUStringm_aValue;
+PPDValueType m_eType;
+//CustomOption stuff for fdo#43049
+//see http://www.cups.org/documentation.php/spec-ppd.html#OPTIONS
+//for full specs, only the basics are implemented here
+bool m_bCustomOption;
+mutable OUString m_aCustomOption;
+OUString m_aOption;
+OUString m_aValue;
};
@@ -82,7 +87,7 @@ public:
PPDKey( const OUString rKey );
~PPDKey();
-PPDValue* insertValue( const OUString rOption, PPDValueType
eType );
+PPDValue* insertValue(const OUString rOption, PPDValueType
eType, bool bCustomOption = false);
int countValues() const
{ return m_aValues.size(); }
// neither getValue will return the query option
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 2cb770f..de30492 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -39,6 +39,8 @@ void RTSDialog::insertAllPPDValues( ListBox rBox, const
PPDParser* pParser, con
for( int i = 0; i pKey-countValues(); i++ )
{
pValue = pKey-getValue( i );
+if (pValue-m_bCustomOption)
+continue;
aOptionText = pParser-translateOption( pKey-getKey(),
pValue-m_aOption) ;
if( m_aJobData.m_aContext.checkConstraints( pKey, pValue ) )
@@ -56,7 +58,7 @@ void RTSDialog::insertAllPPDValues( ListBox rBox, const
PPDParser* pParser, con
}
}
pValue = m_aJobData.m_aContext.getValue( pKey );
-if( pValue )
+if (pValue !pValue-m_bCustomOption)
{
if( ( nPos = rBox.GetEntryPos( (void*)pValue ) ) !=
LISTBOX_ENTRY_NOTFOUND )
rBox.SelectEntryPos( nPos );
@@ -286,8 +288,9 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
*/
RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
-: TabPage(pParent-m_pTabControl, PrinterDevicePage,
vcl/ui/printerdevicepage.ui )
-, m_pParent( pParent )
+: TabPage(pParent-m_pTabControl, PrinterDevicePage,
vcl/ui/printerdevicepage.ui)
+, m_pParent(pParent)
+, m_pCustomValue(NULL)
{
get(m_pPPDKeyBox, options);
get(m_pPPDValueBox, values);
@@ -295,6 +298,9 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
m_pPPDKeyBox-SetDropDownLineCount(12);
m_pPPDValueBox-SetDropDownLineCount(12);
+get(m_pCustomEdit, custom);
+m_pCustomEdit-SetModifyHdl(LINK(this, RTSDevicePage, ModifyHdl));
+
get(m_pLevelBox, level);
get(m_pSpaceBox, colorspace);
get(m_pDepthBox, colordepth);
@@ -423,7 +429,14 @@ sal_uLong RTSDevicePage::getPDFDevice()
return -1; //explicitly PS
}
-
+IMPL_LINK( RTSDevicePage, ModifyHdl, Edit*, pEdit )
+{
+if (m_pCustomValue)
+{
+m_pCustomValue-m_aCustomOption = m_pCustomEdit-GetText();
+}
+return 0;
+}
IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
{
@@ -436,7 +449,7 @@ IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
{
const PPDKey* pKey = (PPDKey*)m_pPPDKeyBox-GetEntryData(
m_pPPDKeyBox-GetSelectEntryPos() );
const PPDValue* pValue = (PPDValue*)m_pPPDValueBox-GetEntryData(
m_pPPDValueBox-GetSelectEntryPos() );
-if( pKey pValue )
+if (pKey pValue)
{
m_pParent-m_aJobData.m_aContext.setValue( pKey, pValue );
FillValueBox( pKey );
@@ -445,11 +458,10 @@ IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
return 0;
}
-
-
void RTSDevicePage::FillValueBox( const PPDKey* pKey )
{
m_pPPDValueBox-Clear();
+m_pCustomEdit-Hide();
if( ! pKey )
return;
@@ -461,13 +473,24 @@ void RTSDevicePage::FillValueBox( const PPDKey*
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdicommon.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 449aa3c6757da834e03129dfff40ac74b385f0e4
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 17:59:37 2014 +0300
Just spell out the NULL instead of having a const variable for it
Change-Id: Iee45a5bb80a1d3149aa231f2848910eee415a64b
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 8d4b035..d628325 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -56,7 +56,6 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
return;
}
(void)bPixelSnap; // TODO
-const CGAffineTransform* pTransform = NULL;
const bool bHasCurves = rPolygon.areControlPointsUsed();
for( int nPointIdx = 0, nPrevIdx = 0;; nPrevIdx = nPointIdx++ )
@@ -91,7 +90,7 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
if( !nPointIdx )
{
// first point = just move there
-CGPathMoveToPoint( xPath, pTransform, aPoint.getX(), aPoint.getY()
);
+CGPathMoveToPoint( xPath, NULL, aPoint.getX(), aPoint.getY() );
continue;
}
@@ -104,7 +103,7 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
if( !bPendingCurve )// line segment
{
-CGPathAddLineToPoint( xPath, pTransform, aPoint.getX(),
aPoint.getY() );
+CGPathAddLineToPoint( xPath, NULL, aPoint.getX(), aPoint.getY() );
}
else// cubic bezier segment
{
@@ -115,7 +114,7 @@ static void AddPolygonToPath( CGMutablePathRef xPath,
aCP1 += aHalfPointOfs;
aCP2 += aHalfPointOfs;
}
-CGPathAddCurveToPoint( xPath, pTransform, aCP1.getX(), aCP1.getY(),
+CGPathAddCurveToPoint( xPath, NULL, aCP1.getX(), aCP1.getY(),
aCP2.getX(), aCP2.getY(), aPoint.getX(),
aPoint.getY() );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/uiconfig
vcl/uiconfig/ui/printdialog.ui | 189 + 1 file changed, 98 insertions(+), 91 deletions(-) New commits: commit e764b46eea2aab37b7f62d6bf495d2b80080e3b2 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 31 16:04:14 2014 +0100 Resolves: fdo#63228 Printers list does not increase height with Print Dialog Change-Id: I731fe5159bead1dc0036ede8d4cd26c233e3b296 diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 2aa464b..a23543c 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- object class=GtkAdjustment id=adjustment1 property name=lower1/property @@ -21,6 +22,93 @@ property name=step_increment1/property property name=page_increment10/property /object + object class=GtkImage id=image1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=stockgtk-media-previous/property +property name=icon_size1/property + /object + object class=GtkImage id=image2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=stockgtk-media-next/property +property name=icon_size1/property + /object + object class=GtkListStore id=liststore1 +columns + !-- column-name gchararray1 -- + column type=gchararray/ + !-- column-name gint1 -- + column type=gint/ +/columns +data + row +col id=0 translatable=yes1/col +col id=11/col + /row + row +col id=0 translatable=yes2/col +col id=12/col + /row + row +col id=0 translatable=yes4/col +col id=14/col + /row + row +col id=0 translatable=yes6/col +col id=16/col + /row + row +col id=0 translatable=yes9/col +col id=19/col + /row + row +col id=0 translatable=yes16/col +col id=116/col + /row + row +col id=0 translatable=yesCustom/col +col id=165535/col + /row +/data + /object + object class=GtkListStore id=liststore2 +columns + !-- column-name gchararray1 -- + column type=gchararray/ +/columns +data + row +col id=0 translatable=yesleft to right, then down/col + /row + row +col id=0 translatable=yestop to bottom, then right/col + /row + row +col id=0 translatable=yestop to bottom, then left/col + /row + row +col id=0 translatable=yesright to left, then down/col + /row +/data + /object + object class=GtkListStore id=liststore3 +columns + !-- column-name gchararray1 -- + column type=gchararray/ +/columns +data + row +col id=0 translatable=yesAutomatic/col + /row + row +col id=0 translatable=yesPortrait/col + /row + row +col id=0 translatable=yesLandscape/col + /row +/data + /object object class=GtkDialog id=PrintDialog property name=can_focusFalse/property property name=border_width6/property @@ -90,11 +178,15 @@ object class=GtkBox id=box1 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property property name=spacing6/property child object class=GtkBox id=box2 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property property name=orientationvertical/property property name=spacing6/property child @@ -188,10 +280,12 @@ object class=GtkNotebook id=tabcontrol property name=visibleTrue/property property name=can_focusTrue/property +property name=vexpandTrue/property child object class=GtkBox id=box3 property name=visibleTrue/property property name=can_focusFalse/property +property name=vexpandTrue/property property name=border_width6/property property name=orientationvertical/property property name=spacing6/property @@ -199,19 +293,20 @@ object class=GtkFrame id=frame1 property name=visibleTrue/property property name=can_focusFalse/property +property name=vexpandTrue/property property name=label_xalign0/property
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 ---
sw/qa/extras/rtfexport/rtfexport.cxx |3 ---
sw/source/filter/ww8/ww8atr.cxx | 15 ---
3 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 84c40768f8acb0342dcfa223133497f57620fc14
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 31 17:01:03 2014 +0200
MSWordExportBase::OutputItemSet: handle fill attributes as frame ones
Fill attributes with their original WhichId are only used for frames at
the moment, replacing RES_BACKGROUND. To keep export filters working,
handle those fill attributes as frame ones as well.
Change-Id: I1e59b483b706d9fd3f9b947e83244740e3293f9e
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2b068ad..77e8370 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -645,15 +645,12 @@ DECLARE_OOXMLEXPORT_TEST(testFdo64826, fdo64826.docx)
CPPUNIT_ASSERT_EQUAL(true, bool(getPropertysal_Bool(mxComponent,
RecordChanges)));
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_OOXMLEXPORT_TEST(testPageBackground, page-background.docx)
{
// 'Document Background' wasn't exported.
uno::Referencebeans::XPropertySet
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x92D050),
getPropertysal_Int32(xPageStyle, BackColor));
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testPageGraphicBackground,
page-graphic-background.odt)
{
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 4b409ad..0aba10b 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -476,8 +476,6 @@ DECLARE_RTFEXPORT_TEST(testTextFrameBorders,
textframe-borders.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aShadowFormat.Color);
}
-#if 0
-// FIXME port to FillAttributes
DECLARE_RTFEXPORT_TEST(testTextframeGradient, textframe-gradient.rtf)
{
uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -498,7 +496,6 @@ DECLARE_RTFEXPORT_TEST(testTextframeGradient,
textframe-gradient.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x66), aGradient.EndColor);
CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style);
}
-#endif
DECLARE_RTFEXPORT_TEST(testRecordChanges, record-changes.rtf)
{
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 2ae3c5d..bf92692 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -296,7 +296,9 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet
rSet, bool bPapFmt, bool
{
pItem = aI-second;
sal_uInt16 nWhich = pItem-Which();
-if ( nWhich = RES_PARATR_BEGIN nWhich RES_FRMATR_END
nWhich != RES_PARATR_NUMRULE)
+// Handle fill attributes just like frame attributes for now.
+if ( (nWhich = RES_PARATR_BEGIN nWhich RES_FRMATR_END
nWhich != RES_PARATR_NUMRULE ) ||
+ (nWhich = XATTR_FILL_FIRST nWhich XATTR_FILL_LAST))
AttrOutput().OutputItem( *pItem );
}
}
@@ -811,7 +813,9 @@ void MSWordExportBase::OutputFormat( const SwFmt rFmt,
bool bPapFmt, bool bChpF
const SwFrmFmt rFrmFmt = mpParentFrame-GetFrmFmt();
SfxItemSet aSet(pDoc-GetAttrPool(), RES_FRMATR_BEGIN,
-RES_FRMATR_END-1);
+RES_FRMATR_END-1,
+XATTR_FILL_FIRST, XATTR_FILL_LAST,
+0);
aSet.Set(rFrmFmt.GetAttrSet());
// Fly als Zeichen werden bei uns zu Absatz-gebundenen
@@ -5365,15 +5369,12 @@ void AttributeOutputBase::OutputItem( const
SfxPoolItem rHt )
case RES_BACKGROUND:
FormatBackground( static_cast const SvxBrushItem ( rHt ) );
break;
-#if 0
-// FIXME port to FillAttributes
-case RES_FILL_STYLE:
+case XATTR_FILLSTYLE:
FormatFillStyle( static_cast const XFillStyleItem ( rHt ) );
break;
-case RES_FILL_GRADIENT:
+case XATTR_FILLGRADIENT:
FormatFillGradient( static_cast const XFillGradientItem ( rHt )
);
break;
-#endif
case RES_BOX:
FormatBox( static_cast const SvxBoxItem ( rHt ) );
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 35 ++
sdext/source/pdfimport/tree/pdfiprocessor.hxx |1
2 files changed, 19 insertions(+), 17 deletions(-)
New commits:
commit 2498e4725e4a8c3a8193e61618d314837d8db180
Author: Vort vv...@yandex.ru
Date: Mon Mar 31 07:59:07 2014 +0300
fdo#49431 PDF Import: Improve line and space detection algorithm
Change-Id: Ia0d53e90f49fa020e0738e295a4584254e2b474e
Reviewed-on: https://gerrit.libreoffice.org/8800
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index d5faf25..581f052 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -57,7 +57,6 @@ namespace pdfi
m_xContext(xContext),
fYPrevTextPosition(-1.0),
-fPrevTextHeight(0.0),
fXPrevTextPosition(0.0),
fPrevTextWidth(0.0),
m_pElFactory( new ElementFactory() ),
@@ -254,10 +253,14 @@ void PDFIProcessor::processGlyphLine()
for (size_t i = 0; i m_GlyphsList.size(); i++)
{
-double spaceSize = 0.0;
+bool prependSpace = false;
if (i != 0)
-spaceSize = m_GlyphsList[i].getRect().X1 - m_GlyphsList[i -
1].getRect().X2;
-bool prependSpace = spaceSize spaceDetectBoundary;
+{
+double spaceSize =
+m_GlyphsList[i].getRect().X1 -
+m_GlyphsList[i - 1].getRect().X2;
+prependSpace = spaceSize spaceDetectBoundary;
+}
drawCharGlyphs(m_GlyphsList[i].getGlyph(),
m_GlyphsList[i].getRect(),
m_GlyphsList[i].getGC(),
@@ -273,13 +276,14 @@ void PDFIProcessor::drawGlyphLine( const OUString
rGlyphs,
const geometry::RealRectangle2D rRect,
const geometry::Matrix2D
rFontMatrix )
{
-double isFirstLine= fYPrevTextPosition+ fXPrevTextPosition+
fPrevTextHeight+ fPrevTextWidth ;
-if(
-( ( ( fYPrevTextPosition!= rRect.Y1 ) ) ||
- ( ( fXPrevTextPosition rRect.X2 ) ) ||
- ( ( fXPrevTextPosition+fPrevTextWidth*1.3)rRect.X1 )
-) ( isFirstLine 0.0 )
-)
+::basegfx::B2DPoint point1(rRect.X1, rRect.Y1);
+::basegfx::B2DPoint point2(rRect.X2, rRect.Y2);
+point1 *= getCurrentContext().Transformation;
+point2 *= getCurrentContext().Transformation;
+
+if ((fYPrevTextPosition != point1.getY()) ||
+(fXPrevTextPosition point2.getX()) ||
+((fXPrevTextPosition + fPrevTextWidth * 1.3) point1.getX()))
{
processGlyphLine();
}
@@ -288,12 +292,11 @@ void PDFIProcessor::drawGlyphLine( const OUString
rGlyphs,
getGCId(getCurrentContext());
-m_GlyphsList.push_back( aGlyph );
+m_GlyphsList.push_back(aGlyph);
-fYPrevTextPosition = rRect.Y1;
-fXPrevTextPosition = rRect.X2;
-fPrevTextHeight = rRect.Y2-rRect.Y1;
-fPrevTextWidth = rRect.X2-rRect.X1;
+fYPrevTextPosition = point1.getY();
+fXPrevTextPosition = point2.getX();
+fPrevTextWidth = point2.getX() - point1.getX();
}
GraphicsContext PDFIProcessor::getTransformGlyphContext( CharGlyph rGlyph )
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 979e170..f2b02bd 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -67,7 +67,6 @@ namespace pdfi
com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext m_xContext;
double fYPrevTextPosition;
-double fPrevTextHeight;
double fXPrevTextPosition;
double fPrevTextWidth;
enum DocumentTextDirecion { LrTb, RlTb, TbLr };
___
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' - wizards/com
wizards/com/sun/star/wizards/ui/ImageList.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa3f404f27b9e816c7c4e947c9da5fb065aa76a7 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Mar 30 21:38:04 2014 +0200 Resolves: fdo#76802 error msg in Web Page Wizard dialog Change-Id: I0fa0537a8726bbda182dea8c3a9014d77973edea Reviewed-on: https://gerrit.libreoffice.org/8798 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py index a42eb01..7decec7 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.py +++ b/wizards/com/sun/star/wizards/ui/ImageList.py @@ -242,7 +242,7 @@ class ImageList(ListDataListener): def refreshCounterText(self): self.lblCounter.Model.Label = self.counterRenderer.render( -self.Counter (self.pageStart + 1, self.pageEnd, +self.Counter (self.pageStart + 1, self.pageEnd(), self.listModel.getSize())) def pageEnd(self): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - wizards/com
wizards/com/sun/star/wizards/ui/ImageList.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a227525d8994be2ccc07e8bda2b51d8827d241c Author: Julien Nabet serval2...@yahoo.fr Date: Sun Mar 30 21:38:04 2014 +0200 Resolves: fdo#76802 error msg in Web Page Wizard dialog Change-Id: I0fa0537a8726bbda182dea8c3a9014d77973edea Reviewed-on: https://gerrit.libreoffice.org/8797 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py index a42eb01..7decec7 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.py +++ b/wizards/com/sun/star/wizards/ui/ImageList.py @@ -242,7 +242,7 @@ class ImageList(ListDataListener): def refreshCounterText(self): self.lblCounter.Model.Label = self.counterRenderer.render( -self.Counter (self.pageStart + 1, self.pageEnd, +self.Counter (self.pageStart + 1, self.pageEnd(), self.listModel.getSize())) def pageEnd(self): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dtrans/source
dtrans/source/win32/ftransl/ftransl.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 001af24128f04df6583bd9613090568817f2b5b2 Author: Armin Le Grand a...@apache.org Date: Thu Feb 20 15:49:56 2014 + Resolves: #i124085# improved support for PNG clipboard format on windows (cherry picked from commit 3bd259ce52b15e968302ecca39f72d06af66e301) Change-Id: Ie9b677d8948912b372a13353cd82a2f5e2f1cf49 Reviewed-on: https://gerrit.libreoffice.org/8785 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 4d25690..f0f5daf 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -483,9 +483,9 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable() //SOT_FORMATSTR_ID_DIALOG_60 m_TranslTable.push_back(FormatEntry(application/vnd.sun.xml.dialog, Dialog 6.0, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_BMP -m_TranslTable.push_back(FormatEntry(image/bmp, Windows Bitmap, NULL, 49657 /* ID for image/bmp CF_INVALID*/, CPPUTYPE_DEFAULT)); +m_TranslTable.push_back(FormatEntry(image/bmp, Windows Bitmap, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_PNG -m_TranslTable.push_back(FormatEntry(image/png, PNG, NULL, 49656 /* ID for image/png CF_INVALID*/, CPPUTYPE_DEFAULT)); +m_TranslTable.push_back(FormatEntry(image/png, PNG, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_DUMMY3 m_TranslTable.push_back(FormatEntry(application/x-openoffice-dummy3;windows_formatname=\SO_DUMMYFORMAT_3\, SO_DUMMYFORMAT_3, NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_DUMMY4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source sw/source
editeng/source/items/borderline.cxx | 10 -- sw/source/filter/ww8/ww8atr.cxx |9 + 2 files changed, 17 insertions(+), 2 deletions(-) New commits: commit fe3dff30205d4b6b276e3687edda48c19de1547f Author: Luke Deller l...@deller.id.au Date: Fri Mar 28 22:51:36 2014 +1100 .doc support for recently-added border line types Some new border line types have been added recently to LibreOffice (FINE_DASHED, DASH_DOT, DASH_DOT_DOT) This change updates .doc import/export to support these. (Import of FINE_DASHED was already working, but not export). Change-Id: Id3bcb1d4e6e9ceb97b492f0c578fd5b885ab16ff Reviewed-on: https://gerrit.libreoffice.org/8780 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 3280988..1edc7d1 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -119,8 +119,6 @@ ConvertBorderStyleFromWord(int const nWordLineStyle) case 2: // thick line case 5: // hairline // and the unsupported special cases which we map to a single line -case 8: -case 9: case 20: return SOLID; case 6: @@ -129,6 +127,10 @@ ConvertBorderStyleFromWord(int const nWordLineStyle) return DASHED; case 22: return FINE_DASHED; +case 8: +return DASH_DOT; +case 9: +return DASH_DOT_DOT; // then the shading beams which we represent by a double line case 23: return DOUBLE; @@ -199,6 +201,8 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle, double const i_fWidth, case DOTTED: case DASHED: +case DASH_DOT: +case DASH_DOT_DOT: return fWidth; // Display a minimum effective border width of 1pt @@ -249,6 +253,8 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle, double const fWidth) case DOTTED: case DASHED: case FINE_DASHED: +case DASH_DOT: +case DASH_DOT_DOT: return fWidth; // Double lines diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index bf92692..5fd495b 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4266,6 +4266,15 @@ WW8_BRCVer9 WW8Export::TranslateBorderLine(const SvxBorderLine rLine, case table::BorderLineStyle::INSET: brcType = 27; break; +case table::BorderLineStyle::FINE_DASHED: +brcType = 22; +break; +case table::BorderLineStyle::DASH_DOT: +brcType = 8; +break; +case table::BorderLineStyle::DASH_DOT_DOT: +brcType = 9; +break; default: break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/editeng
editeng/source/items/borderline.cxx | 12 +---
editeng/source/items/svxitems.src | 16
include/editeng/editrids.hrc|9 -
3 files changed, 33 insertions(+), 4 deletions(-)
New commits:
commit 0b7c8569782ecc5023d221f2063a664d008beb7b
Author: Luke Deller l...@deller.id.au
Date: Fri Mar 28 23:01:44 2014 +1100
Presentation string for recently-added border types
LibreOffice will show a textual description of a style in some contexts
eg in the Organizer tab of the dialog for modifying a style.
This change updates the description of border line types to support
recently-added types: FINE_DASHED, DOUBLE_THIN, DASH_DOT, DASH_DOT_DOT
Also this fixes an out-of-bounds array access in
SvxBorderLine::GetValueString
Change-Id: Ia354a05ab1455eb8bcc079c6e51419a0cc6429d6
Reviewed-on: https://gerrit.libreoffice.org/8781
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 1edc7d1..a2a77d1 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -653,13 +653,19 @@ OUString SvxBorderLine::GetValueString( SfxMapUnit
eSrcUnit,
RID_EMBOSSED,
RID_ENGRAVED,
RID_OUTSET,
-RID_INSET
+RID_INSET,
+RID_FINE_DASHED,
+RID_DOUBLE_THIN,
+RID_DASH_DOT,
+RID_DASH_DOT_DOT
};
-sal_uInt16 nResId = aStyleIds[m_nStyle];
OUString aStr = ( + ::GetColorString( aColor ) + OUString(cpDelim);
-if ( nResId )
+if ( m_nStyle sizeof(aStyleIds)/sizeof(*aStyleIds) )
+{
+sal_uInt16 nResId = aStyleIds[m_nStyle];
aStr += EE_RESSTR(nResId);
+}
else
{
OUString sMetric = EE_RESSTR(GetMetricId( eDestUnit ));
diff --git a/editeng/source/items/svxitems.src
b/editeng/source/items/svxitems.src
index 94d2b8d..0cd0c08 100644
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -588,6 +588,22 @@ String RID_OUTSET
{
Text [ en-US ] = Outset ;
};
+String RID_FINE_DASHED
+{
+Text [ en-US ] = Single, fine dashed;
+};
+String RID_DOUBLE_THIN
+{
+Text [ en-US ] = Double, fixed thin lines;
+};
+String RID_DASH_DOT
+{
+Text [ en-US ] = Single, dash-dot;
+};
+String RID_DASH_DOT_DOT
+{
+Text [ en-US ] = Single, dash-dot-dot;
+};
String RID_SVXITEMS_METRIC_MM
{
Text [ en-US ] = mm ;
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index 89212c2..a17f5a0 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -282,6 +282,9 @@
#define RID_ENGRAVED(RID_EDIT_START + 245)
#define RID_OUTSET (RID_EDIT_START + 246)
#define RID_INSET (RID_EDIT_START + 247)
+#define RID_FINE_DASHED (RID_EDIT_START + 248)
+#define RID_DOUBLE_THIN (RID_EDIT_START + 249)
+// border lines continue at RID_EDIT_START + 330
// Metric-Text
#define RID_SVXITEMS_METRIC_MM (RID_EDIT_START + 250)
@@ -385,7 +388,11 @@
#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION (RID_EDIT_START + 328)
#define RID_SVXSTR_A11Y_PARAGRAPH_NAME (RID_EDIT_START + 329)
-#if 329 (RID_EDIT_END-RID_EDIT_START)
+// Border lines (continued)
+#define RID_DASH_DOT(RID_EDIT_START + 330)
+#define RID_DASH_DOT_DOT(RID_EDIT_START + 331)
+
+#if 331 (RID_EDIT_END-RID_EDIT_START)
#error Resource-Ueberlauf in #line, #file
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/items/borderline.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddac6b1f305ff0c23fc49b50cd90738c7029d555
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 16:33:02 2014 +0100
use SAL_N_ELEMENTS
Change-Id: I533ce52828ae08a6ab111bcbeaaa6b44c62a6ab9
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index a2a77d1..4bea25c 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -661,7 +661,7 @@ OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
};
OUString aStr = ( + ::GetColorString( aColor ) + OUString(cpDelim);
-if ( m_nStyle sizeof(aStyleIds)/sizeof(*aStyleIds) )
+if ( m_nStyle int(SAL_N_ELEMENTS(aStyleIds)) )
{
sal_uInt16 nResId = aStyleIds[m_nStyle];
aStr += EE_RESSTR(nResId);
___
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/filter/html/htmlatr.cxx | 176 ++
1 file changed, 86 insertions(+), 90 deletions(-)
New commits:
commit b5bfa65868b0d1cf735d81686d0f3d97e780c40d
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Wed Mar 19 17:31:22 2014 +0100
fdo#57950 Replace chained append in htmlatr.cxx
Change-Id: I121f437019d45f60017337dea091389ceb8334ce
Reviewed-on: https://gerrit.libreoffice.org/8661
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index 3587596..2a85ebc 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -783,15 +783,14 @@ void OutHTML_SwFmt( Writer rWrt, const SwFmt rFmt,
// ggf ein List-Item aufmachen
if( rInfo.bInNumBulList bNumbered )
{
-OStringBuffer sOut;
-sOut.append('').append(OOO_STRING_SVTOOLS_HTML_li);
+OString sOut = + OString(OOO_STRING_SVTOOLS_HTML_li);
if( USHRT_MAX != nNumStart )
{
-sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value).
-
append(=\).append(static_castsal_Int32(nNumStart)).append(\);
+sOut += + OString(OOO_STRING_SVTOOLS_HTML_O_value) + =\ +
+OString::number(static_castsal_Int32(nNumStart)) + =\;
}
-sOut.append('');
-rWrt.Strm().WriteCharPtr( sOut.getStr() );
+sOut += ;
+rWrt.Strm().WriteOString( sOut );
}
if( rHWrt.nDefListLvl 0 !bForceDL )
@@ -806,9 +805,8 @@ void OutHTML_SwFmt( Writer rWrt, const SwFmt rFmt,
// The align=... attribute does behave strange in netscape
// if there are controls in a paragraph, because the control and
// all text behind the control does not recognize this attribute.
-OStringBuffer sOut;
-sOut.append('').append(OOO_STRING_SVTOOLS_HTML_division);
-rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+OString sOut = + OString(OOO_STRING_SVTOOLS_HTML_division);
+rWrt.Strm().WriteOString( sOut );
rHWrt.bTxtAttr = sal_False;
rHWrt.bOutOpts = sal_True;
@@ -885,28 +883,31 @@ void OutHTML_SwFmt( Writer rWrt, const SwFmt rFmt,
rHWrt.bTxtAttr = sal_False;
rHWrt.bOutOpts = sal_True;
-OStringBuffer sOut;
-sOut.append('').append(aToken);
+OString sOut = + aToken;
if( eLang != LANGUAGE_DONTKNOW eLang != rHWrt.eLang )
{
-rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+rWrt.Strm().WriteOString( sOut );
+sOut = ;
rHWrt.OutLanguage( eLang );
}
if( nDir != rHWrt.nDirection )
{
if( !sOut.isEmpty() )
-rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+{
+rWrt.Strm().WriteOString( sOut );
+sOut = ;
+}
rHWrt.OutDirection( nDir );
}
if( rHWrt.bCfgOutStyles
(!pFmtInfo-aClass.isEmpty() || pFmtInfo-bScriptDependent) )
{
-sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_class)
-.append(=\);
-rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+sOut += + OString(OOO_STRING_SVTOOLS_HTML_O_class) + =\;
+rWrt.Strm().WriteOString( sOut );
+sOut = ;
OUString aClass( pFmtInfo-aClass );
if( pFmtInfo-bScriptDependent )
{
@@ -927,9 +928,10 @@ void OutHTML_SwFmt( Writer rWrt, const SwFmt rFmt,
}
HTMLOutFuncs::Out_String( rWrt.Strm(), aClass,
rHWrt.eDestEnc,
rHWrt.aNonConvertableCharacters );
-sOut.append('\');
+sOut += \;
}
-rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+rWrt.Strm().WriteOString( sOut );
+sOut = ;
// ggf. Ausrichtung ausgeben.
if( !rHWrt.bNoAlign pAdjItem )
@@ -2070,13 +2072,12 @@ Writer OutHTML_SwTxtNode( Writer rWrt, const
SwCntntNode rNode )
rHTMLWrt.bLFPossible = sal_True;
-OStringBuffer sOut;
-sOut.append('').append(OOO_STRING_SVTOOLS_HTML_horzrule);
+OString sOut = + OString(OOO_STRING_SVTOOLS_HTML_horzrule);
const SfxItemSet* pItemSet = pNd-GetpSwAttrSet();
if( !pItemSet )
{
-rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr()
).WriteChar( '' );
+rWrt.Strm().WriteOString( sOut ).WriteChar( '' );
return rHTMLWrt;
}
const SfxPoolItem* pItem;
@@ -2107,23 +2108,25 @@ Writer OutHTML_SwTxtNode( Writer rWrt, const
SwCntntNode rNode )
nPageWidth =
pBox-GetFrmFmt()-GetFrmSize().GetWidth();
[Bug 57950] Replace chained O(U)StringBuffer::append() with operator+
https://bugs.freedesktop.org/show_bug.cgi?id=57950 --- Comment #49 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Krisztian Pinter committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b5bfa65868b0d1cf735d81686d0f3d97e780c40d fdo#57950 Replace chained append in htmlatr.cxx The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - cui/source svtools/source sw/inc sw/source
cui/source/dialogs/linkdlg.cxx |2 +-
svtools/source/misc/embedhlp.cxx |2 +-
sw/inc/crstate.hxx |1 +
sw/source/filter/html/htmlform.cxx |2 ++
sw/source/filter/html/htmlgrin.cxx |4
5 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 790efdf1f96289a0b0de06faf19a60cafdab846b
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 17:02:05 2014 +0100
coverity#708406 Uninitialized pointer field
Change-Id: I446c1eb18d45ca9d70690a763bffe1cc144369b4
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 9094c40..3533c7b 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -181,6 +181,7 @@ struct SwCrsrMoveState
{}
SwCrsrMoveState( SwFillCrsrPos *pInitFill ) :
pFill( pInitFill ),
+p2Lines( NULL ),
pSpecialPos( NULL ),
eState( MV_SETONLYTEXT ),
nCursorBidiLevel( 0 ),
commit 5199e11317f8595bac652ff2bc28c54453c6534d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 16:57:42 2014 +0100
coverity#1130409 Missing break in switch
Change-Id: Iad5076e7717703c7eaea90eeb9ca082aa33cccac
diff --git a/sw/source/filter/html/htmlgrin.cxx
b/sw/source/filter/html/htmlgrin.cxx
index 7da9981..4a3f179 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -859,6 +859,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONLOAD:
eScriptType2 = STARBASIC;
+//fallthrough
case HTML_O_ONLOAD:
aEvent = GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC );
bSetEvent = sal_True;
@@ -866,6 +867,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONUNLOAD:
eScriptType2 = STARBASIC;
+//fallthrough
case HTML_O_ONUNLOAD:
aEvent = GlobalEventConfig::GetEventName(
STR_EVENT_PREPARECLOSEDOC );
bSetEvent = sal_True;
@@ -873,6 +875,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
+//fallthrough
case HTML_O_ONFOCUS:
aEvent = GlobalEventConfig::GetEventName(
STR_EVENT_ACTIVATEDOC );
bSetEvent = sal_True;
@@ -880,6 +883,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
+//fallthrough
case HTML_O_ONBLUR:
aEvent = GlobalEventConfig::GetEventName(
STR_EVENT_DEACTIVATEDOC );
bSetEvent = sal_True;
commit 1f4a6d5526afc856496f462915e6386f78c44143
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 16:56:17 2014 +0100
coverity#1130391 Missing break in switch
Change-Id: If6202788224b59de7bb6db7a17ab2061c1f6f771
diff --git a/sw/source/filter/html/htmlform.cxx
b/sw/source/filter/html/htmlform.cxx
index 90b5dcd..d05fd33 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1337,6 +1337,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
case HTML_O_SDONSUBMIT:
eScriptType2 = STARBASIC;
+//fallthrough
case HTML_O_ONSUBMIT:
nEvent = HTML_ET_ONSUBMITFORM;
bSetEvent = sal_True;
@@ -1344,6 +1345,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
case HTML_O_SDONRESET:
eScriptType2 = STARBASIC;
+//fallthrough
case HTML_O_ONRESET:
nEvent = HTML_ET_ONRESETFORM;
bSetEvent = sal_True;
commit 1e68d390229d1e446d1b77b395a70fa636cf5373
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 16:54:34 2014 +0100
coverity#982430 Division or modulo by zero
Change-Id: I9764d4e122c4dbab2349499f30c17842e432dadc
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index f9cf047..55b6e9f 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -664,7 +664,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const
Rectangle rRect, const OUSt
Bitmap aBmp( SvtResId( BMP_PLUGIN ) );
long nHeight = rRect.GetHeight() - pOut-GetTextHeight();
long nWidth = rRect.GetWidth();
-if( nHeight 0 aBmp.GetSizePixel().Width() 0 )
+if(nHeight 0 nWidth 0 aBmp.GetSizePixel().Width() 0)
{
aPt.Y() = nHeight;
Point aP = rRect.TopLeft();
commit 058b5cac90051949388f136da74a515b212e7bac
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 31 16:49:37 2014 +0100
coverity#704604 Explicit null dereferenced
Change-Id: I400105321f7bed54d56bd7af4dfd14656293b5b9
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 323354c..fa7ecfe 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -500,7 +500,7 @@ IMPL_LINK(
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/gdi/dibtools.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 61efddf5ab8cd318e022ca1ac817ba0879a55e23
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Mar 31 14:37:21 2014 +
124555: restore stream position after Seek to end of stream
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 3aa5df4..d4ea127 100755
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -775,17 +775,18 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp,
Bitmap* pBmpAlpha, sal_uLon
bool ImplReadDIBFileHeader( SvStream rIStm, sal_uLong rOffset )
{
-sal_uInt32 nTmp32;
-sal_uInt16 nTmp16 = 0;
-boolbRet = false;
+bool bRet = false;
-const sal_Int64 nStreamLength (rIStm.Seek(STREAM_SEEK_TO_END));
-rIStm.Seek(STREAM_SEEK_TO_BEGIN);
+const sal_Int64 nSavedStreamPos( rIStm.Tell() );
+const sal_Int64 nStreamLength( rIStm.Seek( STREAM_SEEK_TO_END ) );
+rIStm.Seek( nSavedStreamPos );
+sal_uInt16 nTmp16 = 0;
rIStm nTmp16;
if ( ( 0x4D42 == nTmp16 ) || ( 0x4142 == nTmp16 ) )
{
+sal_uInt32 nTmp32;
if ( 0x4142 == nTmp16 )
{
rIStm.SeekRel( 12L );
@@ -803,7 +804,7 @@ bool ImplReadDIBFileHeader( SvStream rIStm, sal_uLong
rOffset )
bRet = ( rIStm.GetError() == 0UL );
}
-if (rOffset = nStreamLength)
+if ( rOffset = nStreamLength )
{
// Offset claims that image starts past the end of the
// stream. Unlikely.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fixing Bug 46200 [Easy Hack]
Hi Eike, Your reply is very helpful. I know basic c++ and programming but It's hard to go through a large code base. Thank you very much. On Mon, Mar 31, 2014 at 6:09 PM, Eike Rathke er...@redhat.com wrote: Hi Tharindu, On Sunday, 2014-03-30 11:13:13 +0530, Tharindu Amila Perera wrote: 1] ScTabViewShell::KeyInput as the starting point to capture the event the keyinput function decl is found at tabvwsh.hxx. But I cannot seem to find a place it has been used for reference. used in the sense of where it is called? ScTabViewShell is derived from SfxViewShell and the virtual KeyInput() method is called via the sfx2 framework whenever a key is pressed. I would like to know which source file contains the code to handle keyboard events in a spreadsheet. The actual code handling these key events is in sc/source/ui/view/tabvwsh4.cxx ScTabViewShell::TabKeyInput() Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack -- Thanks and regards, Tharindu Amila Perera Undergraduate Department of Computer Science Engineering University of Moratuwa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/file_path_helper.hxx | 56 ---
1 file changed, 56 deletions(-)
New commits:
commit c50e8224a40d8aaf8b8c2f29b1d1240022ac58a5
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 31 18:21:20 2014 +0200
Remove unused inline functions
Change-Id: Ic31f99d6185000660750041065937845d4903bb3
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 6a16a55..4a21062 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -135,40 +135,6 @@ namespace osl
BasePath.pData, RelPath.pData, AbsolutePath.pData);
}
- /*
- systemPathGetFileOrLastDirectoryPart
-Returns the file or the directory part
-of the given path
-
-@param pustrPath [in] a system path,
- must not be NULL
-
-@param ppustrFileOrDirPart [out] on
- return receives the last part
- of the given directory or the
- file name
- if pustrPath is the root path
- '/' an empty string will be
- returned
- if pustrPath has a trailing
- '/' the last part before the
- '/' will be returned else
- the part after the last '/'
- will be returned
-
-@returns nothing
-
- /
-
- inline void systemPathGetFileNameOrLastDirectoryPart(
- const rtl::OUString Path,
-rtl::OUString FileNameOrLastDirPart)
- {
-osl_systemPathGetFileNameOrLastDirectoryPart(
-Path.pData, FileNameOrLastDirPart.pData);
- }
-
-
/
systemPathIsHiddenFileOrDirectoryEntry
Returns sal_True if the last part of
@@ -192,28 +158,6 @@ namespace osl
return osl_systemPathIsHiddenFileOrDirectoryEntry(Path.pData);
}
-
- /
- systemPathIsLocalOrParentDirectoryEntry
-Returns sal_True if the last part of the given
-system path is the local directory entry '.'
-or the parent directory entry '..'
-
-@param pustrPath [in] a system path,
- must not be NULL
-
-@returns sal_True if the last part of the
- given system path is '.' or '..'
- else sal_False
-
- /
-
- inline bool systemPathIsLocalOrParentDirectoryEntry(
- const rtl::OUString Path)
- {
-return osl_systemPathIsLocalOrParentDirectoryEntry(Path.pData);
- }
-
/
searchPath
***/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m | 53
+++---
1 file changed, 38 insertions(+), 15 deletions(-)
New commits:
commit cde082f5f1072530cf7639eb5ce7c24dac9e6826
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 20:10:17 2014 +0300
Bin a few since long commented-out lines
Change-Id: I4087f8f51dd6e8066818a98797c1e575ecca3442
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index a02fcfe..cea417a 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -110,13 +110,9 @@ static void updateTilesPerSecond(UILabel *label)
CGRect bb = CGContextGetClipBoundingBox(ctx);
-// double zoomScale = [(View *) [self superview] zoomScale];
-// CATiledLayer *catl = (CATiledLayer*) [self layer];
-
CGContextSaveGState(ctx);
CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y);
-// CGContextScaleCTM(ctx, 1/zoomScale, 1/zoomScale);
// CGSize tileSize = [catl tileSize];
CGSize tileSize = bb.size;
commit 7c4783f6a2cb7598ecc48f20379dad9784541d5b
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 20:06:23 2014 +0300
Add possibility to show tile numbers and render just one tile
Useful for debugging. Also, make the tile border drawing
optional. These three debugging features are governed by environment
variales (set in Xcode before running with Alt+ProductRun...)
DRAW_ONLY_TILE, DRAW_TILE_BORDERS and DRAW_TILE_NUMBERS.
Change-Id: I81f952284676eafe5d204c819658e0225aabdb1c
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index 88c3095..a02fcfe 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -6,6 +6,8 @@
// 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 CoreText/CoreText.h
+
#include touch/touch.h
#import View.h
@@ -131,22 +133,47 @@ static void updateTilesPerSecond(UILabel *label)
// as needed at the current zoom levels. I keep thinking about
// pixels incorrectly.
-touch_lo_draw_tile(ctx,
- tileSize.width, tileSize.height,
- CGPointMake(bb.origin.x/self.scale,
bb.origin.y/self.scale),
- CGSizeMake(bb.size.width/self.scale,
bb.size.height/self.scale));
+volatile static int number = 0;
+int thisTile = number++;
+
+if (!getenv(DRAW_ONLY_TILE) || thisTile ==
atoi(getenv(DRAW_ONLY_TILE)))
+touch_lo_draw_tile(ctx,
+ tileSize.width, tileSize.height,
+ CGPointMake(bb.origin.x/self.scale,
bb.origin.y/self.scale),
+ CGSizeMake(bb.size.width/self.scale,
bb.size.height/self.scale));
+else {
+CGContextSetRGBFillColor(ctx, 1, 1, 1, 1);
+CGContextFillRect(ctx, CGRectMake(0, 0, bb.size.width,
bb.size.height));
+}
[self didRenderTile];
CGContextRestoreGState(ctx);
-// I am a bit confused about what tiles exactly I am drawing, so
-// make it perfectly obvious by drawing borders around the tiles
-CGContextSaveGState(ctx);
-CGContextSetStrokeColorWithColor(ctx, [[UIColor colorWithRed:1 green:0
blue:0 alpha:0.5] CGColor]);
-CGContextSetLineWidth(ctx, 1);
-CGContextStrokeRect(ctx, bb);
-CGContextRestoreGState(ctx);
+if (getenv(DRAW_TILE_BORDERS)) {
+// I am a bit confused about what tiles exactly I am drawing, so
+// make it perfectly obvious by drawing borders around the tiles
+CGContextSaveGState(ctx);
+CGContextSetStrokeColorWithColor(ctx, [[UIColor colorWithRed:1 green:0
blue:0 alpha:0.5] CGColor]);
+CGContextSetLineWidth(ctx, 1);
+CGContextStrokeRect(ctx, bb);
+CGContextRestoreGState(ctx);
+}
+
+if (getenv(DRAW_TILE_NUMBERS)) {
+// Also draw the order number of the tile;)
+CGContextSaveGState(ctx);
+float scale = 1/[((View *) [self superview]) zoomScale];
+NSString *s = [NSString stringWithFormat:@%d, thisTile];
+CFAttributedStringRef as = CFAttributedStringCreate(NULL, (__bridge
CFStringRef)(s), NULL);
+CTLineRef l = CTLineCreateWithAttributedString(as);
+CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y);
+CGContextScaleCTM(ctx, scale, scale);
+CGContextSetTextPosition(ctx, 2, 12);
+CGContextSetTextMatrix(ctx,
CGAffineTransformScale(CGContextGetTextMatrix(ctx), 1, -1));
+CTLineDraw(l, ctx);
+CGContextRestoreGState(ctx);
+}
}
@end
___
Libreoffice-commits mailing list
Re: Bug 63905 - printing with Draw/Impress
Tibby Lickle wrote: I was wondering if anyone could shed some light on this bug and/or why this design decision was undertaken? Hey Tibby, not ultimately. Have a look at commit cb5427f40 for how the code behaved originally (in the SdXImpressDocument::getRenderer() method) - Impress always had no real notion of a printing format (and associated settings). Getting some reasonably old OOo version comparing current behaviour with it could prove instructive. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 + 1 file changed, 1 insertion(+) New commits: commit 3fec64a87f3b611c13a10c6dd84de0cf9c7c35b5 Author: Tor Lillqvist t...@collabora.com Date: Mon Mar 31 20:58:54 2014 +0300 Need com_sun_star_i18n_Collator_get_implementation for some odt docs, it seems Change-Id: I1f24a281155ade91f0296dbc24550fcd8febf0d0 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 88dbf74..f29a7879 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -75,6 +75,7 @@ core_constructor_list = [ com_sun_star_i18n_BreakIterator_Unicode_get_implementation, com_sun_star_i18n_CharacterClassification_get_implementation, com_sun_star_i18n_CharacterClassification_Unicode_get_implementation, +com_sun_star_i18n_Collator_get_implementation, com_sun_star_i18n_LocaleDataImpl_get_implementation, com_sun_star_i18n_NumberFormatCodeMapper_get_implementation, com_sun_star_i18n_Transliteration_get_implementation, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sot/source
sot/source/sdstor/stgdir.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be3e9eb3656451b3091f45011f33d701f13b3c13
Author: Andre Fischer a...@apache.org
Date: Mon Mar 31 16:08:32 2014 +
i124461: Allow slightly larger nesting depth of SetupEntry call (merged
from branch AOO410).
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index e08281c..d861f2c 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -846,7 +846,7 @@ void StgDirStrm::SetupEntry (
const sal_Int32 nEntryCount,
const sal_Int32 nDepth)
{
-if (nDepth = nEntryCount)
+if (nDepth nEntryCount)
{
// Tree grew higher than there are different nodes. Looks like
// something is wrong with the file. Return now to avoid
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal vcl/inc vcl/quartz
include/sal/log-areas.dox |1
vcl/inc/headless/svpgdi.hxx |3
vcl/inc/quartz/salgdi.h |3
vcl/inc/quartz/salgdicommon.hxx | 12 +++
vcl/inc/quartz/utils.h |9 +-
vcl/quartz/salbmp.cxx |6 -
vcl/quartz/salgdi.cxx | 21 +-
vcl/quartz/salgdicommon.cxx | 132 +++-
vcl/quartz/utils.cxx| 19 -
9 files changed, 188 insertions(+), 18 deletions(-)
New commits:
commit 9c87596c8a0123076249c7bd59eaaa41497b48fc
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 21:05:09 2014 +0300
Add SAL_INFOs for very detailed CoreGraphics tracing
One would think there would exist some kind of shim library that would
automatically provide such traces, hmm.
Change-Id: I568d02a2ac70078dee0280d1feb3eab7bbd43030
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 88ca865..2d712a6 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -354,6 +354,7 @@ certain functionality.
@li @c vcl
@li @c vcl.a11y
@li @c vcl.app
+@li @c vcl.cg - CoreGraphics calls on OS X and iOS
@li @c vcl.control
@li @c vcl.coretext - CoreText-using code for Mac OS X and iOS
@li @c vcl.emf - EMF/EMF+ processing
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index ff7f0e0..987c2e4 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -90,6 +90,9 @@ public:
// mirror AquaSalVirtualDevice::mbForeignContext for SvpSalGraphics
objects related to such
bool mbForeignContext;
CGContextRef mrContext;
+#if OSL_DEBUG_LEVEL 0
+int mnContextStackDepth;
+#endif
class XorEmulation* mpXorEmulation;
int mnXorMode; // 0: off 1: on 2:
invert only
int mnWidth;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 0653484..c009c56 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -158,6 +158,9 @@ protected:
AquaSalFrame* mpFrame;
CGLayerRef mxLayer;// Quartz graphics
layer
CGContextRefmrContext; // Quartz drawing
context
+#if OSL_DEBUG_LEVEL 0
+int mnContextStackDepth;
+#endif
class XorEmulation* mpXorEmulation;
int mnXorMode; // 0: off 1: on 2:
invert only
int mnWidth;
diff --git a/vcl/inc/quartz/salgdicommon.hxx b/vcl/inc/quartz/salgdicommon.hxx
index 4250103..b0d9a2f 100644
--- a/vcl/inc/quartz/salgdicommon.hxx
+++ b/vcl/inc/quartz/salgdicommon.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
#define INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
+#include iostream
+
#include premac.h
#ifdef IOS
#include CoreGraphics/CoreGraphics.h
@@ -64,6 +66,16 @@ inline RGBAColor::RGBAColor( float fRed, float fGreen, float
fBlue, float fAlpha
m_fRGBA[3] = fAlpha;
}
+inline std::ostream operator (std::ostream s, const RGBAColor aColor)
+{
+#ifndef SAL_LOG_INFO
+(void) aColor;
+#else
+s { aColor.GetRed() , aColor.GetGreen() ,
aColor.GetBlue() , aColor.GetAlpha() };
+#endif
+return s;
+}
+
// XOR emulation suckage.
// See
http://www.openoffice.org/marketing/ooocon2008/programme/wednesday_1401.pdf
// and https://bugs.freedesktop.org/show_bug.cgi?id=38844 .
diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h
index fe81c1d..e408250 100644
--- a/vcl/inc/quartz/utils.h
+++ b/vcl/inc/quartz/utils.h
@@ -39,10 +39,13 @@ OUString GetOUString( NSString* );
CFStringRef CreateCFString( const OUString );
NSString* CreateNSString( const OUString );
-std::ostream operator (std::ostream s, CGRect rRect);
-std::ostream operator (std::ostream s, CGPoint rPoint);
-std::ostream operator (std::ostream s, CGSize rSize);
+std::ostream operator (std::ostream s, const CGRect rRect);
+std::ostream operator (std::ostream s, const CGPoint rPoint);
+std::ostream operator (std::ostream s, const CGSize rSize);
std::ostream operator (std::ostream s, CGColorRef pSize);
+std::ostream operator (std::ostream s, const CGAffineTransform aXform);
+
+#define CG_TRACE( e ) SAL_INFO( vcl.cg, e )
#endif // INCLUDED_VCL_INC_QUARTZ_UTILS_H
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 3732550..aaeccaa 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -212,11 +212,7 @@ bool QuartzSalBitmap::CreateContext()
// no conversion needed for truecolor
maContextBuffer = maUserBuffer;
}
-else if( mnBits == 8
-#ifndef IOS
- maPalette.IsGreyPalette()
-#endif
-)
+else if( mnBits == 8 maPalette.IsGreyPalette() )
{
// no conversion needed for
[Libreoffice-commits] core.git: 4 commits - sw/source
sw/source/core/layout/hffrm.cxx|5 - sw/source/core/layout/layact.cxx | 21 - sw/source/core/layout/laycache.cxx | 12 sw/source/core/layout/layouter.cxx |2 -- 4 files changed, 40 deletions(-) New commits: commit 6e238e51c23476cc5d383e0238ca3a688d342773 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Mar 31 20:52:17 2014 +0200 sw: unused includes in layouter Change-Id: Iac0799219df9eb07d1de9886153cbf8390cbacb0 diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 2df6a5f..62e710b 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -20,8 +20,6 @@ #include layouter.hxx #include doc.hxx #include sectfrm.hxx -#include ftnboss.hxx -#include cntfrm.hxx #include pagefrm.hxx #include ftnfrm.hxx #include txtfrm.hxx commit f74a57a4ba327998afac12572f520805539687a6 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Mar 31 20:49:51 2014 +0200 sw: unused includes in laycache Change-Id: Ibd168ee6a5da734bc3b20bbab698953eb13f0e73 diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 598f037..401d837 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include hintids.hxx #include editeng/formatbreakitem.hxx -#include tools/stream.hxx #include doc.hxx #include docstat.hxx #include docary.hxx @@ -29,30 +27,20 @@ #include pagefrm.hxx #include rootfrm.hxx #include txtfrm.hxx -#include ndtxt.hxx #include swtable.hxx #include tabfrm.hxx #include rowfrm.hxx -#include colfrm.hxx -#include bodyfrm.hxx -#include ndindex.hxx #include sectfrm.hxx -#include frmfmt.hxx #include fmtcntnt.hxx #include pagedesc.hxx #include frmtool.hxx #include dflyobj.hxx #include dcontact.hxx #include viewopt.hxx -#include viewsh.hxx #include flyfrm.hxx // OD 2004-05-24 #i28701# #include sortedobjs.hxx -#include pam.hxx -#include docsh.hxx -#include poolfmt.hxx - #include set using namespace ::com::sun::star; commit 8f2d9021d6ea59773099367478a959fa311ac733 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Mar 31 20:42:04 2014 +0200 sw: unused includes in layact Change-Id: I24f8e817e1f615e8cdab6dde7ede3bce1ab226d2 diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 5f72ea6..12016e9 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -22,24 +22,12 @@ #include time.h #include rootfrm.hxx #include pagefrm.hxx -#include cntfrm.hxx -#include doc.hxx -#include IDocumentDrawModelAccess.hxx -#include IDocumentSettingAccess.hxx -#include IDocumentLayoutAccess.hxx -#include IDocumentStatistics.hxx -#include IDocumentTimerAccess.hxx #include viewimp.hxx #include crsrsh.hxx #include dflyobj.hxx -#include flyfrm.hxx #include frmtool.hxx #include dcontact.hxx -#include ndtxt.hxx -#include frmfmt.hxx -#include swregion.hxx #include viewopt.hxx -#include pam.hxx #include dbg_lay.hxx #include layouter.hxx #include docstat.hxx @@ -48,36 +36,27 @@ #include sfx2/event.hxx #include ftnidx.hxx -#include vcl/window.hxx #include vcl/svapp.hxx #include editeng/opaqitem.hxx -#include editeng/brushitem.hxx #include SwSmartTagMgr.hxx #define _LAYACT_CXX #include layact.hxx #include swwait.hxx #include fmtsrnd.hxx -#include fmtanchr.hxx -#include tools/shl.hxx #include docsh.hxx -#include swmodule.hxx -#include fmtline.hxx #include tabfrm.hxx #include ftnfrm.hxx #include txtfrm.hxx #include notxtfrm.hxx #include flyfrms.hxx #include mdiexp.hxx -#include fmtornt.hxx #include sectfrm.hxx -#include lineinfo.hxx #include acmplwrd.hxx // #i28701# #include sortedobjs.hxx #include objectformatter.hxx -#include PostItMgr.hxx #include vector // SwLayAction static stuff commit f4a93651bbda7750021a466e211c530c6bb02dcd Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Mar 31 20:27:48 2014 +0200 sw: unused includes in hffrm Change-Id: I5e993b6ad54f7d33b1dfb1ff455281975add2981 diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 116650f..0cc8b43 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -18,8 +18,6 @@ */ #include pagefrm.hxx -#include viewsh.hxx -#include doc.hxx #include fmtcntnt.hxx #include fmthdft.hxx #include fmtfsize.hxx @@ -30,9 +28,6 @@ #include sectfrm.hxx #include flyfrm.hxx #include frmtool.hxx -#include dflyobj.hxx -#include frmfmt.hxx -#include ndindex.hxx #include hfspacingitem.hxx // OD 2004-05-24 #i28701# #include sortedobjs.hxx ___ 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/print/prtsetup.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6f86b9d016fa8e56ee808c914b26f386d5cec7cc
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 22:03:50 2014 +0300
WaE: unused parameter 'pEdit'
Change-Id: Ibd4abdb0073e20239a220440c14e05f31e88c6a3
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index de30492..50e26e1 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -429,7 +429,7 @@ sal_uLong RTSDevicePage::getPDFDevice()
return -1; //explicitly PS
}
-IMPL_LINK( RTSDevicePage, ModifyHdl, Edit*, pEdit )
+IMPL_LINK( RTSDevicePage, ModifyHdl, Edit*, /* pEdit */ )
{
if (m_pCustomValue)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salbmp.cxx | 23 +--
vcl/quartz/salgdicommon.cxx |1 +
vcl/quartz/salvd.cxx| 11 +--
3 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit 8bc28541fa9d686a753a034a42c652451734
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 22:12:37 2014 +0300
More CoreGraphics tracing
Change-Id: I2fbdb95637ee77b444e1947405d64cdd2e0338af
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index aaeccaa..cea1b6c 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -29,6 +29,7 @@
#include vcl/salbtype.hxx
#include quartz/salbmp.h
+#include quartz/utils.h
#ifdef MACOSX
#include osx/saldata.hxx
@@ -103,7 +104,10 @@ bool QuartzSalBitmap::Create( CGLayerRef xLayer, int
nBitmapBits,
// copy layer content into the bitmap buffer
const CGPoint aSrcPoint = { static_castCGFloat(-nX),
static_castCGFloat(-nY) };
if(mxGraphicContext) // remove warning
+{
+CG_TRACE( CGContextDrawLayerAtPoint( mxGraphicContext ,
aSrcPoint , xLayer ) );
CGContextDrawLayerAtPoint( mxGraphicContext, aSrcPoint, xLayer );
+}
return true;
}
@@ -173,11 +177,16 @@ void QuartzSalBitmap::Destroy()
void QuartzSalBitmap::DestroyContext()
{
-CGImageRelease( mxCachedImage );
-mxCachedImage = NULL;
+if( mxCachedImage )
+{
+CG_TRACE( CGImageRelease( mxCachedImage ) );
+CGImageRelease( mxCachedImage );
+mxCachedImage = NULL;
+}
if( mxGraphicContext )
{
+CG_TRACE( CGContextRelease( mxGraphicContext ) );
CGContextRelease( mxGraphicContext );
mxGraphicContext = NULL;
maContextBuffer.reset();
@@ -739,6 +748,7 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int
nY, int nNewWidth, i
return NULL;
mxCachedImage = CGBitmapContextCreateImage( mxGraphicContext );
+CG_TRACE( CGBitmapContextCreateImage( mxGraphicContext ) =
mxCachedImage );
}
CGImageRef xCroppedImage = NULL;
@@ -753,6 +763,7 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int
nY, int nNewWidth, i
nY = mnHeight - (nY + nNewHeight); // adjust for y-mirrored context
const CGRect aCropRect = { { static_castCGFloat(nX),
static_castCGFloat(nY) }, { static_castCGFloat(nNewWidth),
static_castCGFloat(nNewHeight) } };
xCroppedImage = CGImageCreateWithImageInRect( mxCachedImage, aCropRect
);
+CG_TRACE( CGImageCreateWithImageInRect( mxCachedImage ,
aCropRect ) = xCroppedImage );
}
return xCroppedImage;
@@ -788,13 +799,18 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const
QuartzSalBitmap rMask,
void* pMaskMem = rtl_allocateMemory( nMaskBytesPerRow * nHeight );
CGContextRef xMaskContext = CGBitmapContextCreate( pMaskMem,
nWidth, nHeight, 8, nMaskBytesPerRow, GetSalData()-mxGraySpace,
kCGImageAlphaNone );
+CG_TRACE( CGBitmapContextCreate( nWidth x nHeight x8)
= xMaskContext );
+CG_TRACE( CGContextDrawImage( xMaskContext , xImageRect
, xMask ) );
CGContextDrawImage( xMaskContext, xImageRect, xMask );
+CG_TRACE( CFRelease( xMask ) );
CFRelease( xMask );
CGDataProviderRef xDataProvider( CGDataProviderCreateWithData( NULL,
pMaskMem, nHeight * nMaskBytesPerRow, CFRTLFree ) );
static const CGFloat* pDecode = NULL;
xMask = CGImageMaskCreate( nWidth, nHeight, 8, 8, nMaskBytesPerRow,
xDataProvider, pDecode, false );
+CG_TRACE( CGImageMaskCreate( nWidth , nHeight ,8,8) =
xMask );
CFRelease( xDataProvider );
+CG_TRACE( CFRelease( xMaskContext ) );
CFRelease( xMaskContext );
}
@@ -803,7 +819,10 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const
QuartzSalBitmap rMask,
// combine image and alpha mask
CGImageRef xMaskedImage = CGImageCreateWithMask( xImage, xMask );
+CG_TRACE( CGImageCreateWithMask( xImage , xMask ) =
xMaskedImage );
+CG_TRACE( CFRelease( xMask ) );
CFRelease( xMask );
+CG_TRACE( CFRelease( xImage ) );
CFRelease( xImage );
return xMaskedImage;
}
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index c2e9931..f0b9979 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -484,6 +484,7 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long
nSrcX, long nSrcY,
xSrcLayer = CGLayerCreateWithContext( xCopyContext, aSrcSize, NULL );
CG_TRACE( CGLayerCreateWithContext( xCopyContext ,
aSrcSize ,NULL) = xSrcLayer );
const CGContextRef xSrcContext = CGLayerGetContext( xSrcLayer );
+CG_TRACE( CGLayerGetContext( xSrcLayer ) = xSrcContext );
CGPoint aSrcPoint = CGPointMake(-nSrcX, -nSrcY);
if( IsFlipped() )
{
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index
ship Maven meta information to ease creation of LO plugins with Maven
Hi, to build software with Maven, you have to provide meta information (a pom.xml) to each jar, which is a dependency of your software. In turn, the build system Maven with automatically figure out which jar to fetch from where and in which version. To simplify the creation of Java dependencies for LO and to ease also the packaging of LO extension in Debian/Ubuntu, it would be of much help, if you could ship those pom.xml for this use case with the source. This meta information is easy and quick to generate and the only maintenance overhead is the version number increase at each LO release. You don't need to also use Maven for building LO, you just have to ship one pom.xml for one jar file. Not only Debian/Ubuntu would benefit from this little adjustment, also other projects could use the provided meta information. It would be of course even greater to have the shipped jar files together with the meta information in a online repository, whereas this is not as important as the first issue. Such a repository existed for OpenOffice before they moved to Apache (see http://mvnrepository.com/artifact/org.openoffice). Thanks! Sebastian -- Web: http://www.crustulus.de | Blog: http://www.crustulus.de/cgi-bin/blog.cgi?de-0 Freies Latein-Deutsch-Wörterbuch: http://www.crustulus.de/freedict.de.html FreeDict: Free multilingual dictionary databases - http://www.freedict.org signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salbmp.cxx | 15 ++-
vcl/quartz/salvd.cxx |1 +
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 092f498fb3dd4f89ab43c0c76930ecc42a2900d4
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 31 23:01:40 2014 +0300
More CoreGraphics tracing
Change-Id: Idfb615063ec8822dee468883c844bab7dba7cf4c
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index cea1b6c..8003356 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -86,6 +86,7 @@ bool QuartzSalBitmap::Create( CGLayerRef xLayer, int
nBitmapBits,
if( nY 0 )
nHeight += nY, nY = 0;
const CGSize aLayerSize = CGLayerGetSize( xLayer );
+CG_TRACE( CGLayerGetSize( xLayer ) = aLayerSize );
if( nWidth = (int)aLayerSize.width - nX )
nWidth = (int)aLayerSize.width - nX;
if( nHeight = (int)aLayerSize.height - nY )
@@ -255,8 +256,9 @@ bool QuartzSalBitmap::CreateContext()
if( maContextBuffer.get() )
{
-mxGraphicContext = ::CGBitmapContextCreate( maContextBuffer.get(),
mnWidth, mnHeight,
+mxGraphicContext = CGBitmapContextCreate( maContextBuffer.get(),
mnWidth, mnHeight,
bitsPerComponent, nContextBytesPerRow, aCGColorSpace, aCGBmpInfo );
+CG_TRACE( CGBitmapContextCreate( mnWidth x mnHeight
x bitsPerComponent ) = mxGraphicContext );
}
if( !mxGraphicContext )
@@ -868,6 +870,7 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int
nY, int nWidth, int nHe
CGDataProviderRef xDataProvider(
CGDataProviderCreateWithData(NULL, pMaskBuffer, nHeight * nDestBytesPerRow,
CFRTLFree) );
xMask = CGImageCreate(nWidth, nHeight, 8, 32, nDestBytesPerRow,
GetSalData()-mxRGBSpace, kCGImageAlphaPremultipliedFirst, xDataProvider, NULL,
true, kCGRenderingIntentDefault);
+CG_TRACE( CGImageCreate( nWidth x nHeight x8) =
xMask );
CFRelease(xDataProvider);
}
else
@@ -906,6 +909,7 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData
rData )
OSL_TRACE(QuartzSalBitmap::%s(): kCGBitmapByteOrder32Host not
found = inserting it.,__func__);
CGImageRef xImage = CGBitmapContextCreateImage (mxGraphicContext);
+CG_TRACE( CGBitmapContextCreateImage( mxGraphicContext )
= xImage );
// re-create the context with single change: include
kCGBitmapByteOrder32Host flag.
CGContextRef mxGraphicContextNew = CGBitmapContextCreate(
CGBitmapContextGetData(mxGraphicContext),
@@ -915,18 +919,27 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData
rData )
CGBitmapContextGetBytesPerRow(mxGraphicContext),
CGBitmapContextGetColorSpace(mxGraphicContext),
CGBitmapContextGetBitmapInfo(mxGraphicContext) | kCGBitmapByteOrder32Host);
+CG_TRACE( CGBitmapContextCreate(
CGBitmapContextGetWidth(mxGraphicContext) x
CGBitmapContextGetHeight(mxGraphicContext) x
CGBitmapContextGetBitsPerComponent(mxGraphicContext) ) =
mxGraphicContextNew );
+
+CG_TRACE( CFRelease( mxGraphicContext ) );
CFRelease(mxGraphicContext);
// Needs to be flipped
+CG_TRACE( CGContextSaveGState( mxGraphicContextNew ) );
CGContextSaveGState( mxGraphicContextNew );
+CG_TRACE( CGContextTranslateCTM( mxGraphicContextNew ,0,
CGBitmapContextGetHeight(mxGraphicContextNew) ) );
CGContextTranslateCTM (mxGraphicContextNew, 0,
CGBitmapContextGetHeight(mxGraphicContextNew));
+CG_TRACE( CGContextScaleCTM( mxGraphicContextNew ,1,-1)
);
CGContextScaleCTM (mxGraphicContextNew, 1.0, -1.0);
+CG_TRACE( CGContextDrawImage( mxGraphicContextNew ,
CGRectMake(0, 0, CGImageGetWidth(xImage), CGImageGetHeight(xImage)) ,
xImage ) );
CGContextDrawImage(mxGraphicContextNew, CGRectMake( 0, 0,
CGImageGetWidth(xImage), CGImageGetHeight(xImage)), xImage);
// Flip back
+CG_TRACE( CGContextRestoreGState( mxGraphicContextNew )
);
CGContextRestoreGState( mxGraphicContextNew );
+CG_TRACE( CGImageRelease( xImage ) );
CGImageRelease( xImage );
mxGraphicContext = mxGraphicContextNew;
}
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 0d8cc28..543fc5d 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -179,6 +179,7 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
if( mxLayer )
{
const CGSize aSize = CGLayerGetSize( mxLayer );
+CG_TRACE( CGlayerGetSize( mxLayer ) = aSize );
if( (nDX == aSize.width) (nDY == aSize.height) )
{
// Yay, we do not have to
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source
svtools/source/control/roadmap.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 54f27df803da7f9b0d7de9dc027dc89bc20ad560 Author: Ariel Constenla-Haile arie...@apache.org Date: Mon Mar 31 19:41:22 2014 + i124570 - Prevent a null pointer dereference diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 5178b69..ad4c75a 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -766,7 +766,8 @@ namespace svt SetFont( aFont ); RoadmapTypes::ItemId curItemID = GetCurrentRoadmapItemID(); RoadmapItem* pLabelItem = GetByID( curItemID ); - pLabelItem-ToggleBackgroundColor(rStyleSettings.GetHighlightColor()); +if ( pLabelItem != NULL ) + pLabelItem-ToggleBackgroundColor(rStyleSettings.GetHighlightColor()); Invalidate(); } } ___ 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/graphicfilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6e0b9798b329fc1a9b8429461b09726a8f2107f3
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Mar 31 16:18:18 2014 +0200
error: unused variable 'aReturnString'
Change-Id: I53241eb41a07546fe4af010246d8ca373b0b1945
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 8a649a0..c3dbbda 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2280,9 +2280,9 @@ int GraphicFilter::LoadGraphic( const OUString rPath,
const OUString rFilterNa
else
nRes = pFilter-ImportGraphic( rGraphic, rPath, *pStream, nFilter,
pDeterminedFormat );
+#ifdef DBG_UTIL
OUString aReturnString;
-#ifdef DBG_UTIL
switch (nRes)
{
case GRFILTER_OPENERROR:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/headless/svpgdi.hxx |6 ++ vcl/inc/quartz/salgdi.h |2 -- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit 17e2d6982cee17888f97e1d268186e297a6c5dbd Author: Tor Lillqvist t...@collabora.com Date: Mon Mar 31 23:10:05 2014 +0300 Need to define mnContextStackDepth always it seems Change-Id: I25d86e2765aae353fa5586244f33728cd5b55bbc diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 987c2e4..028d71c 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -89,10 +89,8 @@ public: CGLayerRef mxLayer; // mirror AquaSalVirtualDevice::mbForeignContext for SvpSalGraphics objects related to such bool mbForeignContext; -CGContextRef mrContext; -#if OSL_DEBUG_LEVEL 0 -int mnContextStackDepth; -#endif +CGContextRefmrContext; +int mnContextStackDepth; class XorEmulation* mpXorEmulation; int mnXorMode; // 0: off 1: on 2: invert only int mnWidth; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index c009c56..722d368 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -158,9 +158,7 @@ protected: AquaSalFrame* mpFrame; CGLayerRef mxLayer;// Quartz graphics layer CGContextRefmrContext; // Quartz drawing context -#if OSL_DEBUG_LEVEL 0 int mnContextStackDepth; -#endif class XorEmulation* mpXorEmulation; int mnXorMode; // 0: off 1: on 2: invert only int mnWidth; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/column3.cxx | 108 +++
sc/source/ui/docshell/docsh8.cxx | 55 +--
2 files changed, 134 insertions(+), 29 deletions(-)
New commits:
commit e65141e93a540fc9fb4343ee65a5a7da7e3b1769
Author: Eike Rathke er...@redhat.com
Date: Mon Mar 31 19:28:31 2014 +0200
re-enabled user-defined numeric fields for dBase export
Since commit f59e350d1733125055f1144f8b3b1b0a46f6d1ca it was impossible
to define a numeric field with a precision of less than 2 decimals, even
if all values were integers. It was also impossible to define a field
width larger than needed for any values in that column. Furthermore, the
integer part was shortened if the overall column's values resulted in
more precision than defined, but the overall length did not reach the
predefined length.
This does not change the behavior of the original intention of
f59e350d1733125055f1144f8b3b1b0a46f6d1ca to give the precision of number
formats precedence over precision defined in the column header, which is
debatable though because conflicts may silently change the field
definition.
Change-Id: I234c4bceaa1a6aadbd259cb8d9b6cb6f16bf91c2
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index bd1cebd..86ee9a2 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2683,25 +2683,42 @@ class MaxNumStringLenHandler
SvNumberFormatter* mpFormatter;
sal_Int32 mnMaxLen;
sal_uInt16 mnPrecision;
+sal_uInt16 mnMaxGeneralPrecision;
+bool mbHaveSigned;
void processCell(size_t nRow, ScRefCellValue rCell)
{
-if (rCell.meType == CELLTYPE_FORMULA !rCell.mpFormula-IsValue())
-return;
+sal_uInt16 nCellPrecision = mnMaxGeneralPrecision;
+if (rCell.meType == CELLTYPE_FORMULA)
+{
+if (!rCell.mpFormula-IsValue())
+return;
+
+// Limit unformatted formula cell precision to precision
+// encountered so far, if any, otherwise we'd end up with 15 just
+// because of =1/3 ... If no precision yet then arbitrarily limit
+// to a maximum of 4 unless a maximum general precision is set.
+if (mnPrecision)
+nCellPrecision = mnPrecision;
+else
+nCellPrecision = (mnMaxGeneralPrecision = 15) ? 4 :
mnMaxGeneralPrecision;
+}
+
+double fVal = rCell.getValue();
+if (!mbHaveSigned fVal 0.0)
+mbHaveSigned = true;
OUString aString;
+OUString aSep;
+sal_Int32 nLen;
+sal_uInt16 nPrec;
sal_uInt32 nFormat = static_castconst SfxUInt32Item*(
-mrColumn.GetAttr(nRow, ATTR_VALUE_FORMAT))-GetValue();
-ScCellFormat::GetInputString(rCell, nFormat, aString, *mpFormatter,
mrColumn.GetDoc());
-sal_Int32 nLen = aString.getLength();
-if (nLen = 0)
-// Ignore empty string.
-return;
-
-if (nFormat)
+mrColumn.GetAttr(nRow, ATTR_VALUE_FORMAT))-GetValue();
+if (nFormat % SV_COUNTRY_LANGUAGE_OFFSET)
{
+aSep = mpFormatter-GetFormatDecimalSep(nFormat);
+ScCellFormat::GetInputString(rCell, nFormat, aString,
*mpFormatter, mrColumn.GetDoc());
const SvNumberformat* pEntry = mpFormatter-GetEntry(nFormat);
-sal_uInt16 nPrec;
if (pEntry)
{
bool bThousand, bNegRed;
@@ -2710,15 +2727,54 @@ class MaxNumStringLenHandler
}
else
nPrec = mpFormatter-GetFormatPrecision(nFormat);
+}
+else
+{
+if (mnPrecision = mnMaxGeneralPrecision)
+return; // early bail out for nothing changes here
-if (nPrec != SvNumberFormatter::UNLIMITED_PRECISION nPrec
mnPrecision)
-mnPrecision = nPrec;
+if (!fVal)
+{
+// 0 doesn't change precision, but set a maximum length if
none yet.
+if (!mnMaxLen)
+mnMaxLen = 1;
+return;
+}
+
+// Simple number string with at most 15 decimals and trailing
+// decimal zeros eliminated.
+aSep = .;
+aString = rtl::math::doubleToUString( fVal,
rtl_math_StringFormat_F, nCellPrecision, '.', true);
+nPrec = SvNumberFormatter::UNLIMITED_PRECISION;
}
+nLen = aString.getLength();
+if (nLen = 0)
+// Ignore empty string.
+return;
+
+if (nPrec == SvNumberFormatter::UNLIMITED_PRECISION mnPrecision
mnMaxGeneralPrecision)
+{
+if (nFormat % SV_COUNTRY_LANGUAGE_OFFSET)
+{
+// For some reason we couldn't obtain a precision from the
+// format, retry
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |1 +
include/vcl/print.hxx|1 +
include/vcl/virdev.hxx |3 +++
include/vcl/window.hxx |5 +++--
vcl/source/gdi/outdev4.cxx |3 +--
vcl/source/gdi/print.cxx |5 +
vcl/source/gdi/virdev.cxx|5 +
vcl/source/window/window.cxx |8
8 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 6d0273b70b228af6b18e0dfdb89759ccad30a03c
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Tue Apr 1 01:28:02 2014 +1100
fdo#74702 New abstract function UsePolyPolygonForComplexGradient()
A new protected abstract function has been introduced only for
complex gradients. As it stands, we currently need to work out if
we should use a PolyPolygon or a Polygon because, as the comments
say:
// Determine if we output via Polygon or PolyPolygon
// For all rasteroperations other then Overpaint always use
// PolyPolygon, as we will get wrong results if we output multiple
// times on top of each other.
// Also for printers always use PolyPolygon, as not all printers
// can print polygons on top of each other.
Interestingly, the next line is either wrong or expressed badly,
because the check uses PolyPolygons when a VirtualDevice is in use:
// Also virtual devices are excluded, as some drivers are too slow.
Therefore, I've removed that comment as it seems rather misleading.
Change-Id: Ic496284cb2be8e7e2d348eae76aeeec994e1029c
Reviewed-on: https://gerrit.libreoffice.org/8802
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 363cdbf..56aa073 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -805,6 +805,7 @@ protected:
const Point rSrcPtPixel,
const Size rSrcSizePixel );
virtual longImplGetGradientStepCount( long nMinRect );
+virtual boolUsePolyPolygonForComplexGradient() = 0;
/** Transform and draw a bitmap directly
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 0271f0b..d70e7c0 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -274,6 +274,7 @@ public:
protected:
longImplGetGradientStepCount( long nMinRect )
SAL_OVERRIDE;
+virtual boolUsePolyPolygonForComplexGradient()
SAL_OVERRIDE;
voidScaleBitmap ( Bitmap, SalTwoRect )
SAL_OVERRIDE { };
public:
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 0436b5d..b2a29be 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -140,6 +140,9 @@ public:
private:
SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX,
sal_Int32 i_nDPIY );
+protected:
+virtual boolUsePolyPolygonForComplexGradient()
SAL_OVERRIDE;
+
};
#endif // INCLUDED_VCL_VIRDEV_HXX
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 5751489..a527a8f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -579,8 +579,9 @@ protected:
virtual sal_uInt16 getDefaultAccessibleRole() const;
virtual OUString getDefaultAccessibleName() const;
-virtual void CopyAreaFinal( SalTwoRect aPosAry, sal_uInt32
nFlags) SAL_OVERRIDE;
-virtual void ClipToPaintRegion( Rectangle rDstRect )
SAL_OVERRIDE;
+virtual voidCopyAreaFinal( SalTwoRect aPosAry, sal_uInt32
nFlags) SAL_OVERRIDE;
+virtual voidClipToPaintRegion( Rectangle rDstRect )
SAL_OVERRIDE;
+virtual boolUsePolyPolygonForComplexGradient()
SAL_OVERRIDE;
public:
bool HasMirroredGraphics() const SAL_OVERRIDE;
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index c3873b6..4d23620 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -372,7 +372,6 @@ void OutputDevice::ImplDrawComplexGradient( const
Rectangle rRect,
// as we will get wrong results if we output multiple times on top of each
other.
// Also for printers always use PolyPolygon, as not all printers
// can print polygons on top of each other.
-// Also virtual devices are excluded, as some drivers are too slow.
boost::scoped_ptrPolyPolygon pPolyPoly;
Rectangle aRect;
@@ -393,7 +392,7 @@ void OutputDevice::ImplDrawComplexGradient( const
Rectangle rRect,
rGradient.GetBoundRect( rRect, aRect, aCenter );
-if( (meRasterOp != ROP_OVERPAINT) || (meOutDevType != OUTDEV_WINDOW) ||
bMtf )
+if ( UsePolyPolygonForComplexGradient() || bMtf )
pPolyPoly.reset(new PolyPolygon( 2 ));
long nMinRect = std::min( aRect.GetWidth(), aRect.GetHeight() );
diff --git a/vcl/source/gdi/print.cxx
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zformat.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0a2cd63a2675496ef2ba19a9144246ff4c20955a
Author: Caolán McNamara caol...@redhat.com
Date: Sat Mar 29 21:16:41 2014 +
coverity#735502 Logically dead code
Change-Id: I386944df28c7e7464e596144a5612a205f5cb967
Reviewed-on: https://gerrit.libreoffice.org/8789
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 893ff54..6fac57a 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -199,7 +199,7 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8
nDBNum, LanguageType eLang
eLang = 0x03FF;// 10 bit primary language
if ( bDate )
{
-if ( nDBNum == 4 eLang == LANGUAGE_KOREAN )
+if ( nDBNum == 4 eLang == (LANGUAGE_KOREAN 0x03FF) )
{
nNatNum = 9;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zformat.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0416742a914a92228704f899c6bbc1c2851620c4
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 1 00:08:35 2014 +0200
adapted the ifdef'ed portion as well
Change-Id: I95ef44f12ad478677e761edb19528829d33363c9
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 6fac57a..cb5e494 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -283,7 +283,7 @@ sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8
nNatNum, LanguageType eLan
eLang = 0x03FF;// 10 bit primary language
if ( bDate )
{
-if ( nNatNum == 9 eLang == LANGUAGE_KOREAN )
+if ( nNatNum == 9 eLang == (LANGUAGE_KOREAN 0x03FF) )
{
nDBNum = 4;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/import-tests.cxx | 37 + 1 file changed, 37 insertions(+) New commits: commit 2aaf9a5c9a06b770598c84b427c5099bf127d856 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Tue Apr 1 01:55:02 2014 +0200 prevent leaked tmp files from sd import test Change-Id: I6365924420f636c8db556d0bce02b2131e540f2c diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 462e2ed..d532b6c 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -179,6 +179,7 @@ void SdFiltersTest::testSmoketest() } CPPUNIT_ASSERT_MESSAGE( changed, !pDoc-IsChanged() ); + xDocShRef-DoClose(); } @@ -218,6 +219,8 @@ void SdFiltersTest::testN759180() } } } + +xDocShRef-DoClose(); } void SdFiltersTest::testN821567() @@ -245,6 +248,8 @@ void SdFiltersTest::testN821567() aAny = bgImage; } CPPUNIT_ASSERT_MESSAGE(Slide Background is not exported properly, !bgImage.isEmpty()); + +xDocShRef-DoClose(); } void SdFiltersTest::testN862510_1() @@ -270,6 +275,8 @@ void SdFiltersTest::testN862510_1() CPPUNIT_ASSERT_MESSAGE( Baseline attribute not handled properly, !( pFontEscapement pFontEscapement-GetProp() != 100 ) ); } } + +xDocShRef-DoClose(); } void SdFiltersTest::testN862510_2() @@ -289,6 +296,8 @@ void SdFiltersTest::testN862510_2() CPPUNIT_ASSERT( pObj ); CPPUNIT_ASSERT_MESSAGE( Wrong Text Rotation!, pObj-GetExtraTextRotation( true ) == 90 ); } + +xDocShRef-DoClose(); } void SdFiltersTest::testN862510_3() @@ -308,6 +317,8 @@ void SdFiltersTest::testN862510_3() CPPUNIT_ASSERT( pObj ); CPPUNIT_ASSERT_MESSAGE( Left Spacing is wrong! check attribute anchorCtr, pObj-GetTextLeftDistance() 30); } + +xDocShRef-DoClose(); } void SdFiltersTest::testN862510_4() @@ -333,6 +344,8 @@ void SdFiltersTest::testN862510_4() CPPUNIT_ASSERT_MESSAGE( gradfill for text color not handled!, !( pC pC-GetValue().GetColor() == 0 ) ); } } + +xDocShRef-DoClose(); } void SdFiltersTest::testN828390() @@ -371,6 +384,8 @@ void SdFiltersTest::testN828390() } } CPPUNIT_ASSERT_MESSAGE(Subscript not exported properly, bPassed); + +xDocShRef-DoClose(); } void SdFiltersTest::testN828390_2() @@ -391,6 +406,8 @@ void SdFiltersTest::testN828390_2() const EditTextObject aEdit = pTxtObj-GetOutlinerParaObject()-GetTextObject(); CPPUNIT_ASSERT(aEdit.GetText(0) == OUString(Linux )); CPPUNIT_ASSERT(aEdit.GetText(1) == OUString(Standard Platform)); + +xDocShRef-DoClose(); } void SdFiltersTest::testN828390_3() @@ -425,6 +442,8 @@ void SdFiltersTest::testN828390_3() } } CPPUNIT_ASSERT_MESSAGE(CharEscapment not imported properly, bPassed); + +xDocShRef-DoClose(); } void SdFiltersTest::testN828390_4() @@ -465,6 +484,8 @@ void SdFiltersTest::testN828390_4() } } CPPUNIT_ASSERT(bPassed); + +xDocShRef-DoClose(); } void SdFiltersTest::testN828390_5() @@ -489,6 +510,8 @@ void SdFiltersTest::testN828390_5() CPPUNIT_ASSERT( pNumFmt ); CPPUNIT_ASSERT_EQUAL_MESSAGE( Bullet's relative size is wrong!, pNumFmt-GetNumRule()-GetLevel(1).GetBulletRelSize(), sal_uInt16(75) ); // != 25 } + +xDocShRef-DoClose(); } void SdFiltersTest::testN778859() @@ -508,6 +531,8 @@ void SdFiltersTest::testN778859() CPPUNIT_ASSERT_MESSAGE( no text object, pTxtObj != NULL); CPPUNIT_ASSERT(!pTxtObj-IsAutoFit()); } + +xDocShRef-DoClose(); } void SdFiltersTest::testFdo68594() @@ -527,6 +552,8 @@ void SdFiltersTest::testFdo68594() CPPUNIT_ASSERT_MESSAGE( no color item, pC != NULL); // Color should be black CPPUNIT_ASSERT_MESSAGE( Placeholder color mismatch, pC-GetValue().GetColor() == 0); + +xDocShRef-DoClose(); } void SdFiltersTest::testFdo72998() @@ -551,6 +578,8 @@ void SdFiltersTest::testFdo72998() CPPUNIT_ASSERT_MESSAGE( Width should be zero - for forcing scale to 1, !aViewBox.Width ); CPPUNIT_ASSERT_MESSAGE( Height should be zero - for forcing scale to 1, !aViewBox.Height ); } + +xDocShRef-DoClose(); } void SdFiltersTest::testFdo64512() @@ -593,6 +622,8 @@ void SdFiltersTest::testFdo64512() xNode-getTarget(), uno::UNO_QUERY_THROW ); CPPUNIT_ASSERT_MESSAGE( inner node not referencing svg shape, xTargetShape != xSvgShape ); + +xDocShRef-DoClose(); } // Unit test for importing charts @@ -638,6 +669,8 @@ void SdFiltersTest::testFdo71075() uno::Sequence double aValues( xNumSeq-getNumericalData()); for(sal_Int32 i=0;ixValueSeq-getData().getLength();i++) CPPUNIT_ASSERT_MESSAGE( Invalid Series count, aValues.getConstArray()[i] == values[i]); + +xDocShRef-DoClose(); } void SdFiltersTest::testStrictOOXML() @@
Code Pointers for Removing Toolbar from Database Form Design
Hi All, Hoping to get some guidance on this: https://bugs.freedesktop.org/show_bug.cgi?id=76752 Apparently the toolbar I made is automatically showing in database forms (as empty). Weird thing is that once you uncheck the toolbar in View -- Toolbars the toolbar disappears from the list (Changes). Guidance appreciates. Warm Regards, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit f1ba280a5dd646654bd86fd3db26a2347484e8cc
Author: Trent MacAlpine tmac...@gmail.com
Date: Wed Mar 5 22:40:15 2014 -0500
fdo#42164 Esc doesn't clear copy source overlay in panes of split/frozen
view
Change-Id: I480fe9a66773bbc6775c6d20c9cf0e2f7e21c230
Reviewed-on: https://gerrit.libreoffice.org/8472
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 710f131..2c27961 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3264,7 +3264,8 @@ void ScGridWindow::KeyInput(const KeyEvent rKEvt)
// hide the border around the copy source
pViewData-SetPasteMode( SC_PASTE_NONE );
-UpdateCopySourceOverlay();
+// Clear CopySourceOverlay in each window of a split/frozen tabview
+pViewData-GetView()-UpdateCopySourceOverlay();
return;
}
// wenn semi-Modeless-SfxChildWindow-Dialog oben, keine KeyInputs:
@@ -3273,7 +3274,8 @@ void ScGridWindow::KeyInput(const KeyEvent rKEvt)
if (rKeyCode.GetCode() == KEY_ESCAPE)
{
pViewData-SetPasteMode( SC_PASTE_NONE );
-UpdateCopySourceOverlay();
+// Clear CopySourceOverlay in each window of a split/frozen tabview
+pViewData-GetView()-UpdateCopySourceOverlay();
}
// query for existing note marker before calling ViewShell's keyboard
handling
// which may remove the marker
___
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/bitmap3.cxx | 135 +++--
1 file changed, 71 insertions(+), 64 deletions(-)
New commits:
commit 95d7ebd22dd20da5a7a26000494b553944fc23ee
Author: Milan Zelenka zelen...@fel.cvut.cz
Date: Wed Mar 26 21:52:36 2014 +0100
Improved coding style as shown in examples fdo#75240
Change-Id: I6a19453637ea6de8e8c834ad14d7cdf712671e46
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index f8bdb4e..eed5988 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -212,9 +212,9 @@ const long FloydIndexMap[6] =
void ImplCreateDitherMatrix( sal_uInt8 (*pDitherMatrix)[16][16] )
{
-double fVal = 3.125;
+const double fVal = 3.125;
const double fVal16 = fVal / 16.;
-long i, j, k, l;
+const double fValScale = 254.;
sal_uInt16 pMtx[ 16 ][ 16 ];
sal_uInt16 nMax = 0;
static const sal_uInt8 pMagic[4][4] = { { 0, 14, 3, 13, },
@@ -223,17 +223,20 @@ void ImplCreateDitherMatrix( sal_uInt8
(*pDitherMatrix)[16][16] )
{7, 9, 4, 10 } };
// Build MagicSquare
-for ( i = 0; i 4; i++ )
- for ( j = 0; j 4; j++ )
- for ( k = 0; k 4; k++ )
-for ( l = 0; l 4; l++ )
-nMax = std::max ( pMtx[ (k2) + i][(l2 ) + j] =
-(sal_uInt16) ( 0.5 + pMagic[i][j]*fVal +
pMagic[k][l]*fVal16 ), nMax );
+for ( long i = 0; i 4; i++ )
+ for ( long j = 0; j 4; j++ )
+ for ( long k = 0; k 4; k++ )
+for ( long l = 0; l 4; l++ )
+{
+pMtx[ (k2) + i][(l2 ) + j ] = (sal_uInt16) ( 0.5 +
pMagic[i][j]*fVal + pMagic[k][l]*fVal16 );
+nMax = std::max ( pMtx[ (k2) + i][(l2 ) + j], nMax );
+}
// Scale to interval [0;254]
-for ( i = 0, fVal = 254. / nMax; i 16; i++ )
-for( j = 0; j 16; j++ )
-(*pDitherMatrix)[i][j] = (sal_uInt8) ( fVal * pMtx[i][j] );
+double tmp = fValScale / nMax;
+for ( long i = 0; i 16; i++ )
+for( long j = 0; j 16; j++ )
+(*pDitherMatrix)[i][j] = (sal_uInt8) ( tmp * pMtx[i][j] );
}
bool Bitmap::Convert( BmpConversion eConversion )
@@ -684,7 +687,6 @@ bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color*
pExtColor )
boost::scoped_arrayImpErrorQuad pErrQuad2(new ImpErrorQuad[
nWidth ]);
ImpErrorQuad* pQLine1 = pErrQuad1.get();
ImpErrorQuad* pQLine2 = 0;
-long nX, nY;
long nYTmp = 0L;
sal_uInt8 cIndex;
bool bQ1 = true;
@@ -705,9 +707,10 @@ bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color*
pExtColor )
pWriteAcc-SetPalette( aPal );
-for( nY = 0L; nY std::min( nHeight, 2L ); nY++, nYTmp++ )
+for( long nY = 0L; nY std::min( nHeight, 2L ); nY++, nYTmp++ )
{
-for( nX = 0L, pQLine2 = !nY ? pErrQuad1.get() :
pErrQuad2.get(); nX nWidth; nX++ )
+pQLine2 = !nY ? pErrQuad1.get() : pErrQuad2.get();
+for( long nX = 0L; nX nWidth; nX++ )
{
if( pReadAcc-HasPalette() )
pQLine2[ nX ] = pReadAcc-GetPaletteColor(
pReadAcc-GetPixelIndex( nYTmp, nX ) );
@@ -716,12 +719,13 @@ bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount,
Color* pExtColor )
}
}
-for( nY = 0L; nY nHeight; nY++, nYTmp++ )
+for( long nY = 0L; nY nHeight; nY++, nYTmp++ )
{
// first pixel in the line
cIndex = (sal_uInt8) aColorMap.GetBestPaletteIndex( pQLine1[ 0
].ImplGetColor() );
pWriteAcc-SetPixelIndex( nY, 0, cIndex );
+long nX;
for( nX = 1L; nX nWidth1; nX++ )
{
cIndex = (sal_uInt8) aColorMap.GetBestPaletteIndex( aColor
= pQLine1[ nX ].ImplGetColor() );
@@ -1099,10 +1103,6 @@ bool Bitmap::ImplScaleInterpolate( const double
rScaleX, const double rScaleY
long nHeight = pReadAcc-Height();
Bitmap aNewBmp( Size( nNewWidth, nHeight ), 24 );
BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
-long nX, nY;
-long lXB0, lXB1, lXG0, lXG1, lXR0, lXR1;
-double fTemp;
-long nTemp;
if( pReadAcc pWriteAcc )
{
@@ -1113,15 +1113,15 @@ bool Bitmap::ImplScaleInterpolate( const double
rScaleX, const double rScaleY
boost::scoped_arraylong pLutInt(new long[ nNewWidth ]);
boost::scoped_arraylong pLutFrac(new long[ nNewWidth ]);
-for( nX = 0L, nTemp = nWidth - 2L; nX nNewWidth; nX++ )
+for( long nX = 0L, nTemp = nWidth - 2L; nX nNewWidth; nX++ )
{
-fTemp = nX * fRevScaleX;
+double fTemp = nX * fRevScaleX;
pLutInt[
[Bug 75240] improve coding style in bitmap3.cxx
https://bugs.freedesktop.org/show_bug.cgi?id=75240 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup ||target:4.3.0 --- Comment #7 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Milan Zelenka committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=95d7ebd22dd20da5a7a26000494b553944fc23ee Improved coding style as shown in examples fdo#75240 The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 --- Comment #40 from Tim Deaton t...@timdeaton.org --- Issue 61991 is only partially a duplicate of this one. This issue has dealt exclusively with adding a cropping tool to Writer. Issue 61991 (and 74099, which I created and which was marked as a duplicate of 61991) deal with that AND with adding the same capability to Calc. Because of that, and because of Bjorn's comment (in 61991) about writing a short rationale, I decided to copy my statement from issue 74099 below. --- copied from 74099 61991 --- I have long found that when I need to print something from the computer screen, the easiest way to do it was to hit PrintScreen, then paste it into an Excel spreadsheet, then crop and resize it till I have what I want. For instance, I frequently want to crop overlay two Google Maps screenshots so they fit together. Or save an entire year of cropped screenshots of payroll tax confirmation screens on the same spreadsheet page. (For me, Excel does these things far more easily than Word or Paint.) For years I've occasionally tried the same thing using first OpenOffice Calc 3.x and now LibreOffice 4.0.x, and found that it is much more difficult. Calc brings up a window with measurements you can change, and its own small snapshot of the graphic that shows where you are moving the borders to. It works, but it is hard to get it just right. You cannot see it well, and must repeatedly invoke the tool, change the measurements, and quit the tool to see what you've really got. It takes several iterations to get it where you want it. Excel's cropping tool (at least as far back as Excel 97) allows the mouse to grab the handles on the graphic's edges and drag them where you want them, which is far easier both to see and to do. PLEASE add a mouse tool that can be used directly on the image in the spreadsheet. The cropping icon could still bring up the window (for those who prefer it), and then a button in that window could replace the window with the mouse tool. --- end of copy --- Thanks, Tim -- 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: Fixing Bug 46200 [Easy Hack]
Hi all, Using the reply I found out that the events coming from the keyboard has this behavior. Using the argument KeyEvent coming to function in file tabvwsh4.cxx bool ScTabViewShell::TabKeyInput(const KeyEvent rKEvt) I can get codes of all keys except of Caps-Lock, NumLock and Scroll(Which is the needed input). I noticed that when any of the above keys are pressed this function is called twice. But in both events the keycodes are not accessible. When CapsLock is on pressing key 'A' in keyboard will give the same keycode as when it is not on. So there must be a place where it is handled to differentiate a and A inputs. It would be appreciated if I can get a code pointer for this. On Mon, Mar 31, 2014 at 9:39 PM, Tharindu Amila Perera amilastb...@gmail.com wrote: Hi Eike, Your reply is very helpful. I know basic c++ and programming but It's hard to go through a large code base. Thank you very much. On Mon, Mar 31, 2014 at 6:09 PM, Eike Rathke er...@redhat.com wrote: Hi Tharindu, On Sunday, 2014-03-30 11:13:13 +0530, Tharindu Amila Perera wrote: 1] ScTabViewShell::KeyInput as the starting point to capture the event the keyinput function decl is found at tabvwsh.hxx. But I cannot seem to find a place it has been used for reference. used in the sense of where it is called? ScTabViewShell is derived from SfxViewShell and the virtual KeyInput() method is called via the sfx2 framework whenever a key is pressed. I would like to know which source file contains the code to handle keyboard events in a spreadsheet. The actual code handling these key events is in sc/source/ui/view/tabvwsh4.cxx ScTabViewShell::TabKeyInput() Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack -- Thanks and regards, Tharindu Amila Perera Undergraduate Department of Computer Science Engineering University of Moratuwa -- Thanks and regards, Tharindu Amila Perera Undergraduate Department of Computer Science Engineering University of Moratuwa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/ado/AColumn.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 89147da58913a10157632a56a3c156911b86e1df
Author: Noel Grandin n...@peralex.com
Date: Tue Apr 1 07:49:44 2014 +0200
fix sal_Bool conversion in connectivity/source/drivers/ado
Change-Id: I89a17d645870d9a6a896c738979b1e1f59caa08e
diff --git a/connectivity/source/drivers/ado/AColumn.cxx
b/connectivity/source/drivers/ado/AColumn.cxx
index 96d2e22..5ae6385 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -252,7 +252,7 @@ void OAdoColumn::fillPropertyValues()
if ( aProps.IsValid() )
{
-m_IsAutoIncrement = OTools::getValue( aProps,
OUString(Autoincrement) );
+m_IsAutoIncrement = static_castsal_Bool( OTools::getValue(
aProps, OUString(Autoincrement) ) ) == 1;
m_Description = OTools::getValue( aProps,
OUString(Description) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Crash in Impress, when you add a directory and a single picture to the Photo Album
Hi Thomas The bug also occurs under Windows if I use the LibreOffice dialogs. When using the standard Windows dialog the folder is not selected (as expected), only the single image. Maybe this is related to https://bugs.freedesktop.org/show_bug.cgi?id=76778 which has already been fixed in Master (I haven't verified because I stopped using daily builds) Regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Crash-in-Impress-when-you-add-a-directory-and-a-single-picture-to-the-Photo-Album-tp4103514p4103575.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Crash in Impress, when you add a directory and a single picture to the Photo Album
Hello Pedro, *, On Montag, 31. März 2014 12:00 Pedro wrote: The bug also occurs under Windows if I use the LibreOffice dialogs. When using the standard Windows dialog the folder is not selected (as expected), only the single image. oh, with KDE 4.11.3 under Debian Testing i686, I can mark both the directory as well as the picture. But if I want to insert them, nothing happens ... ;) Maybe this is related to https://bugs.freedesktop.org/show_bug.cgi?id=76778 which has already been fixed in Master (I haven't verified because I stopped using daily builds) I tested it with LO Version: 4.3.0.0.alpha0+ Build ID: 8bf22e7fe67b3321e2b2dcc8fb98882ef0eef4ca TinderBox: Linux-rpm_deb- x86@45-TDF, Branch:master, Time: 2014-03-25_23:30:53 under Debian Testing i686, but it is still the same ... :( If I do not disable LO's own dialog, it crashes, and when I use KDE's own dialog, LO does nothing ... :( Thanks for testing and confirming Thomas. -- petribar: Any sun-bleached prehistoric candy that has been sitting in the window of a vending machine too long. -- Rich Hall, Sniglets ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Crash in Impress, when you add a directory and a single picture to the Photo Album
Hi Thomas Thomas Hackert wrote Maybe this is related to https://bugs.freedesktop.org/show_bug.cgi?id=76778 which has already been fixed in Master (I haven't verified because I stopped using daily builds) I tested it with LO Version: 4.3.0.0.alpha0+ Build ID: 8bf22e7fe67b3321e2b2dcc8fb98882ef0eef4ca TinderBox: Linux-rpm_deb- x86@45-TDF, Branch:master, Time: 2014-03-25_23:30:53 under Debian Testing i686, but it is still the same ... :( If I do not disable LO's own dialog, it crashes, and when I use KDE's own dialog, LO does nothing ... :( You probably didn't notice that the patch for the bug was submitted yesterday. So your build from the 25th couldn't possibly include the fix :) Try with today and/or tomorrow's build and if it isn't fixed report a new bug. Regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Crash-in-Impress-when-you-add-a-directory-and-a-single-picture-to-the-Photo-Album-tp4103514p4103655.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 64397] Wiki Publisher: Unknown certificate message, when trying to add TDF wiki to Tools - Options - Internet - MediaWiki
https://bugs.freedesktop.org/show_bug.cgi?id=64397 --- Comment #23 from thack...@nexgo.de --- Good morning Julien, *, (In reply to comment #22) thackert: for the test, could you give a new try with a recent daily build (see http://dev-builds.libreoffice.org/daily/master/)? I cannot confirm it with LO Version: 4.3.0.0.alpha0+ Build ID: c176cb8907530a795cb0e38de8193df931f891fb TinderBox: Linux-rpm_deb-x86@45-TDF, Branch:master, Time: 2014-03-31_03:13:50 (parallel installed, following the instructions from https://wiki.documentfoundation.org/Installing_in_parallel) under Debian Testing i686 ... :( I still get the error message quote The certificate of the selected site is unknown. /quote ... :( Have a nice day Thomas. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 38533] FORMATING : text color render different from background color whereas it's the same color
https://bugs.freedesktop.org/show_bug.cgi?id=38533 --- Comment #13 from fabien.mic...@hespul.org --- Bug still present in version 4.2.0.4 on Mac OS 10.9.2 Build ID: 05dceb5d363845f2cf968344d7adab8dcfb2ba71 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72155] Calc no more doesn't update links automaticaly
https://bugs.freedesktop.org/show_bug.cgi?id=72155 --- Comment #7 from Rudolf Kollien rudolf.koll...@medas.de --- I'm so sorry, but LO 4.1.5.3 still behaves near the same way. But 4.1.5.3 not always refuse to update the links, it does it from time to time. No schema when and why. The workaround is still to open the first (source) spreadsheet, then the second one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76819] New: FILEOPEN: Crach with segfault on opening attached pptx
https://bugs.freedesktop.org/show_bug.cgi?id=76819 Priority: medium Bug ID: 76819 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN: Crach with segfault on opening attached pptx Severity: normal Classification: Unclassified OS: Linux (All) Reporter: k@capitar.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.3.1 rc Component: Presentation Product: LibreOffice Problem description: On ubuntu 14.04 (trusty) libreoffice impress version 4.2.3.2 (Build ID: 420m0(Build:2)) is installed. Opening a specific pptx causes a segmentation fault. Steps to reproduce: 1. Open file 2014-03-30 1000 uur.pptx Current behavior: Segfault Expected behavior: Success on opening file Operating System: Ubuntu Version: 4.2.3.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76809] wrong icons
https://bugs.freedesktop.org/show_bug.cgi?id=76809 Alexander Larsson al...@redhat.com changed: What|Removed |Added Assignee|al...@redhat.com|libreoffice-b...@lists.free ||desktop.org Product|Icon theme |LibreOffice Version|ALL |unspecified Component|hicolor |Installation --- Comment #1 from Alexander Larsson al...@redhat.com --- Not hicolor related -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76734] Text Box is not preserved for file created in MSWord 2007
https://bugs.freedesktop.org/show_bug.cgi?id=76734 Jorendc jore...@libreoffice.org changed: What|Removed |Added Attachment #96527|text/plain |application/vnd.openxmlform mime type||ats-officedocument.wordproc ||essingml.document -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76734] Text Box is not preserved for file created in MSWord 2007
https://bugs.freedesktop.org/show_bug.cgi?id=76734 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||jore...@libreoffice.org Ever confirmed|0 |1 --- Comment #4 from Jorendc jore...@libreoffice.org --- Reproducible, tested using Mac OSX 10.9 with LibreOffice Version: 4.3.0.0.alpha0+ Build ID: 37672f11a72723040b1c9452772dc6e12409e6cd TinderBox: MacOSX-x86@49-TDF, Branch:master, Time: 2014-03-29_00:52:28 Kind regards, Joren -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69195] Crash when delete a style in use
https://bugs.freedesktop.org/show_bug.cgi?id=69195 --- Comment #6 from Mohamed-Ali medalibenmans...@gmail.com --- Crash in Windows 7. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76741] FILESAVE: DOCX Table Width Type and Alignment is not preserved
https://bugs.freedesktop.org/show_bug.cgi?id=76741 Jorendc jore...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||jore...@libreoffice.org Ever confirmed|0 |1 --- Comment #3 from Jorendc jore...@libreoffice.org --- Reproducible, tested using Mac OSX 10.9 with LibreOffice Version: 4.3.0.0.alpha0+ Build ID: 37672f11a72723040b1c9452772dc6e12409e6cd TinderBox: MacOSX-x86@49-TDF, Branch:master, Time: 2014-03-29_00:52:28 Kind regards, Joren -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67506] Impress starts with first slide regardless of setting in options
https://bugs.freedesktop.org/show_bug.cgi?id=67506 --- Comment #10 from Pjotr pjotr1...@gmail.com --- I do my 5 different lectures in one presentation file each. They have 200-300 slides per file. Need to click 280 times to reach slide 280 is annoying! Well, start your presentation, then while it is showing page 1, just type 280 and press enter and slide 280 will be shown. At least this works flawlessly for me. Cheers, Pjotr. BTW: The Shift-F5 option is still not traceable in the Impress Helpfile. Who in the organization should be addressed to have this minor line added, that could be of great help for users that simply need help on this and prevent bugposts like this? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76758] Test Bibi-GUI
https://bugs.freedesktop.org/show_bug.cgi?id=76758 --- Comment #1 from Florian Reisinger reisi...@gmail.com --- New location: http://dev-builds.libreoffice.org/.bibi-gui/GitBisectGUI.zip -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 32848] LibreOffice for OS X should be available in the Mac App Store
https://bugs.freedesktop.org/show_bug.cgi?id=32848 Foss f...@openmailbox.org changed: What|Removed |Added Status|REOPENED|NEW CC||f...@openmailbox.org -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45194] : LibreOffice Template Websites
https://bugs.freedesktop.org/show_bug.cgi?id=45194 --- Comment #5 from Foss f...@openmailbox.org --- Use Firefox then. Is this still happening with latest IE? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71330] TABLE: Libre office crashes many times when inserting a row to a table
https://bugs.freedesktop.org/show_bug.cgi?id=71330 Foss f...@openmailbox.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #15 from Foss f...@openmailbox.org --- Since we do not have a test file, nor is the user willing to test newer version, plus Björn assumes this might be fixed already and be a dupe, and reproducing on Ubuntu 13.10 LO 4.2 did not trigger any crash: setting to WORKSFORME. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76509] Other: Lacking feature in Quick start
https://bugs.freedesktop.org/show_bug.cgi?id=76509 Foss f...@openmailbox.org changed: What|Removed |Added Status|REOPENED|NEEDINFO --- Comment #3 from Foss f...@openmailbox.org --- lal, which applications are you aware of, that check for updates without being open? Note that e.g. flash or java do run in the background and are thus able to check. Not sure if having a LO agent for updates is worth the effort. Also highly doubt that there's capacity for that. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76419] BUGZILLAASSISTANT: display redirect info to redmine, since website bugs are filed there now (was: no version for website bugs)
https://bugs.freedesktop.org/show_bug.cgi?id=76419 Foss f...@openmailbox.org changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|normal |enhancement Summary|BUGZILLAASSISTANT: no |BUGZILLAASSISTANT: display |version for website bugs|redirect info to redmine, ||since website bugs are ||filed there now (was: no ||version for website bugs) Ever confirmed|0 |1 --- Comment #4 from Foss f...@openmailbox.org --- title adjusted. BSA should display redirect info as soon as user selects www component. Not sure if using more than one tracker is smart though. I understand that redmine has more features than bugzilla but it makes things more difficult to keep track of. Setting to NEW since valid enhancement request. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
