[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdview.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a763ef3c0cfdb1fd04528a393a44be508314072b
Author: Regina Henschel
Date: Wed Apr 18 01:00:08 2012 +0200
fdo#48473 Missing translation of local String constant
Consolidated two occurences of the same string into macro
(to prevent them to diverge again)
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 18237ce..ecfd6f4 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1167,12 +1167,13 @@ Pointer SdrView::GetPreferedPointer(const Point&
rMousePos, const OutputDevice*
return Pointer(POINTER_ARROW);
}
+#define STR_NOTHING "nothing"
XubString SdrView::GetStatusText()
{
XubString aStr;
XubString aName;
-aStr.AppendAscii("nothing");
+aStr.AppendAscii(STR_NOTHING);
if (pAktCreate!=NULL)
{
@@ -1267,7 +1268,7 @@ XubString SdrView::GetStatusText()
#endif
}
-if(aStr.EqualsAscii("nix"))
+if(aStr.EqualsAscii(STR_NOTHING))
{
if (AreObjectsMarked()) {
ImpTakeDescriptionStr(STR_ViewMarked,aStr);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c6ec7ed43b0861e1c96d62aa75b594b1dd81e315
Author: Jan Holesovsky
Date: Sun Apr 15 12:43:27 2012 +0200
findbar: Allow F3 to search next when in the find combobox.
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index de6f161..4e63eef 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -157,7 +157,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
}
}
-if ( KEY_RETURN == nCode || (bMod1 && (KEY_G == nCode)) )
+if ( KEY_RETURN == nCode || (bMod1 && (KEY_G == nCode)) || (KEY_F3
== nCode) )
{
Remember_Impl(GetText());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 03a651507e34ee423674d2a537f2bb4b509af6d6
Author: Muthu Subramanian
Date: Thu Apr 12 16:05:23 2012 +0530
n#717947: Fixed pdf export (of images).
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 75581d6..c43d4cf 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -130,7 +130,7 @@ namespace sdr
}
else
{
-if(rObjectContact.isOutputToPrinter())
+if(rObjectContact.isOutputToPrinter() ||
rObjectContact.isOutputToPDFFile())
{
// #i76395# preview mechanism is only active if
// swapin is called from inside paint preparation,
so mbInsidePaint
@@ -182,7 +182,7 @@ namespace sdr
{
ObjectContact& rObjectContact = GetObjectContact();
-if(rObjectContact.isOutputToPrinter())
+if(rObjectContact.isOutputToPrinter() ||
rObjectContact.isOutputToPDFFile())
{
// #i76395# preview mechanism is only active if
// swapin is called from inside paint preparation, so
mbInsidePaint
@@ -195,7 +195,7 @@ namespace sdr
rGrafObj.mbInsidePaint = true;
rGrafObj.ForceSwapIn();
rGrafObj.mbInsidePaint = false;
-}
+}
bRetval = true;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source sw/source
svx/source/tbxctrls/tbcontrl.cxx | 12
svx/source/tbxctrls/tbxcolorupdate.cxx | 16 ++--
sw/source/ui/docvw/edtwin.cxx |8
3 files changed, 34 insertions(+), 2 deletions(-)
New commits:
commit ae7c80640df922630060b82ffa91fd7db2e4d6d7
Author: Winfried Donkers
Date: Sun Mar 11 09:05:02 2012 +0100
fdo#45671 set initial color for split buttons
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0ecf87d..cb56fac 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2231,6 +2231,14 @@ void SvxColorToolBoxControl::StateChanged(
//
// class SvxColorExtToolBoxControl
//
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+ (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
+ */
SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
sal_uInt16 nSlotId,
@@ -2252,11 +2260,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
case SID_ATTR_CHAR_COLOR:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:Color" )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_RED;
break;
case SID_ATTR_CHAR_COLOR2:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:CharColorExt" )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_RED;
break;
case SID_BACKGROUND_COLOR:
@@ -2264,11 +2274,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
default:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:CharBackgroundExt" )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_YELLOW;
break;
case SID_FRAME_LINECOLOR:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:FrameLineColor" )));
nMode = 0;
+mLastColor = COL_BLUE;
break;
}
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 1b567d4..c62ce1b 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -44,6 +44,14 @@ namespace svx
//
//= ToolboxButtonColorUpdater
//
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+ (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
+ */
ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
sal_uInt16 nId,
@@ -64,13 +72,17 @@ namespace svx
{
case SID_ATTR_CHAR_COLOR :
case SID_ATTR_CHAR_COLOR2 :
-Update( COL_BLACK );
+Update( COL_RED );
+break;
+case SID_FRAME_LINECOLOR :
+Update( COL_BLUE );
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND :
+case SID_BACKGROUND_COLOR :
Update( COL_YELLOW );
break;
default :
-Update( COL_GRAY );
+Update( COL_TRANSPARENT );
}
}
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index bb2daba..5aabb08 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -176,6 +176,14 @@ QuickHelpData* SwEditWin::pQuickHlpData = 0;
longSwEditWin::nDDStartPosY = 0;
longSwEditWin::nDDStartPosX = 0;
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+ (SwEditWin::aT
[Libreoffice-commits] .: svx/source
svx/source/items/algitem.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 49d7d4b3255f731ce9a8b5256da25f6a9bf53169
Author: Julien Nabet
Date: Sun Mar 18 16:36:54 2012 +0100
Fix redundant assignment of "nAngle" in switch
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index ff93abb..5fa6d82 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -180,8 +180,8 @@ sal_Int32 SvxOrientationItem::GetRotation( sal_Int32
nStdAngle ) const
sal_Int32 nAngle = nStdAngle;
switch( static_cast< SvxCellOrientation >( GetValue() ) )
{
-case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;
-case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000;
+case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;break;
+case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000;break;
default: ; //prevent warning
}
return nAngle;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/sdr/overlay/overlaymanager.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit badbf0c9259a6ff3928958332532c5a9ed8c5774 Author: Caolán McNamara Date: Tue Mar 13 16:00:09 2012 + Related: fdo#46728 it would help to initialize the reference count I suppose diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index e94f02d..7095058 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -130,6 +130,7 @@ namespace sdr OutputDevice& rOutputDevice, OverlayManager* pOldOverlayManager) : Scheduler(), +mnRefCount(0), rmOutputDevice(rOutputDevice), maOverlayObjects(), maStripeColorA(Color(COL_BLACK)), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source sw/source
svx/source/tbxctrls/tbcontrl.cxx | 30 ++
sw/source/ui/app/swmodule.cxx|2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit df0644161bf9b8e476eb138726f38ba5f11b19b7
Author: Winfried Donkers
Date: Thu Mar 8 12:56:57 2012 +0100
fdo#45682 split button for writer table line color
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2a20d4a..b434e00 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2261,6 +2261,11 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:CharBackgroundExt" )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
break;
+
+case SID_FRAME_LINECOLOR:
+addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:FrameLineColor" )));
+nMode = 0;
+break;
}
pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId,
&GetToolBox(), nMode );
@@ -2302,6 +2307,10 @@ SfxPopupWindow*
SvxColorExtToolBoxControl::CreatePopupWindow()
case SID_BACKGROUND_COLOR :
pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
break;
+
+case SID_FRAME_LINECOLOR:
+pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
+break;
}
pColorWin->StartPopupMode( &GetToolBox(),
@@ -2338,6 +2347,22 @@ void SvxColorExtToolBoxControl::StateChanged(
mLastColor = pItem->GetValue();
}
break;
+
+case SID_FRAME_LINECOLOR :
+ToolBox& rTbx = GetToolBox();
+rTbx.EnableItem( nSID, SFX_ITEM_DISABLED != eState );
+rTbx.SetItemState( nSID, ( SFX_ITEM_DONTCARE == eState ) ?
STATE_DONTKNOW : STATE_NOCHECK );
+
+if ( SFX_ITEM_DONTCARE != eState )
+{
+pItem = PTR_CAST( SvxColorItem, pState );
+if ( pItem )
+{
+pBtnUpdater->Update( pItem->GetValue());
+mLastColor = pItem->GetValue();
+}
+}
+break;
}
}
}
@@ -2373,6 +2398,11 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:CharBackgroundExt" ));
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
"CharBackgroundExt" ));
break;
+
+case SID_FRAME_LINECOLOR :
+aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:FrameLineColor" ));
+aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
"FrameLineColor" ));
+break;
}
Sequence< PropertyValue > aArgs( 1 );
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index ab74737..03bb5a2 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -355,7 +355,7 @@ void SwDLL::RegisterControls()
SvxColorExtToolBoxControl::RegisterControl( SID_BACKGROUND_COLOR, pMod );
SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod );
SvxFrameLineStyleToolBoxControl::RegisterControl(SID_FRAME_LINESTYLE, pMod
);
-SvxFrameLineColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod
);
+SvxColorExtToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod );
SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME_INTERACT, pMod );
SvxColumnsToolBoxControl::RegisterControl(FN_INSERT_FRAME, pMod );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 5af303c0cd4d46c459c6b90712843967d716c866
Author: Stephan Bergmann
Date: Thu Mar 1 17:35:47 2012 +0100
-Werror=unused-variable
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b750152..d24421d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2319,8 +2319,6 @@ void SvxColorExtToolBoxControl::StateChanged(
sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
-sal_uInt16 nId = GetId();
-ToolBox& rTbx = GetToolBox();
const SvxColorItem* pItem = 0;
if ( bChoiceFromPalette )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/form/datanavi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7b860d4970604f08ebd2e818bfd63891dd940804
Author: Noel Power
Date: Thu Mar 1 12:10:56 2012 +
fix crash using instances dialog of dataform navigator fdo#44816
also silence a valgrind 'Conditional jump or move depends on uninitialised
value(s)' where initial state of a checkbox was undefined
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 38543c6..ebdaff3 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -304,7 +304,8 @@ namespace svxform
m_pNaviWin ( _pNaviWin ),
m_bHasModel ( false ),
m_eGroup( _eGroup ),
-m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) )
+m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ),
+m_bLinkOnce ( false )
{
FreeResource();
@@ -1881,7 +1882,6 @@ namespace svxform
m_aTabCtrl.SetPageText( nId, sNewName );
bIsDocModified = true;
}
-delete(pPage);
}
break;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdograf.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 0c6d89941118368ccbb596362a545db5d3a07dbe
Author: Michael Stahl
Date: Wed Feb 29 22:34:51 2012 +0100
fdo#46340: fix crash in SdrGrafObj::getInputStream:
Add the ridiculous hack that used to be here (and distributed across
various GetDocumentStream methods to make it non-obvious)
that makes this not crash by accident.
(regression from fd95f1ab6220c6a530fd2e4e727417f504a5db51)
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 23f81df..6fd9cf3 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1335,6 +1335,14 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
::comphelper::LifecycleProxy proxy;
xStream.set(
pModel->GetDocumentStream(pGraphic->GetUserData(), proxy));
+// fdo#46340: this may look completely insane, and it is,
+// but it also prevents a crash: the LifecycleProxy will go out
+// of scope, but the xStream must be returned; the UcbStreamHelper
+// will actually copy the xStream to a temp file (because it is
+// not seekable), which makes it not crash...
+SvStream *const pStream =
+utl::UcbStreamHelper::CreateStream(xStream);
+xStream.set(new utl::OInputStreamWrapper(pStream, true));
}
else if( pGraphic && GetGraphic().IsLink() )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source sw/Library_swui.mk
svx/source/dialog/txencbox.cxx |8
sw/Library_swui.mk | 35 ---
2 files changed, 28 insertions(+), 15 deletions(-)
New commits:
commit 0d55cc7bf4dc62a0a5029fc19d0f05e08b6dc110
Author: Riccardo Magliocchetti
Date: Tue Feb 21 22:44:21 2012 +0100
Some more work for --disable-database-connectivity
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 9a07c5f..9aa5736 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -30,7 +30,9 @@
#include "svx/txencbox.hxx"
#include "svx/txenctab.hxx"
#include
+#ifndef DISABLE_DBCONNECTIVITY
#include "svx/dbcharsethelper.hxx"
+#endif
#include
#include
#include
@@ -124,6 +126,11 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
+#ifdef DISABLE_DBCONNECTIVITY
+(void)bExcludeImportSubsets;
+(void)nExcludeInfoFlags;
+(void)nButIncludeInfoFlags;
+#else
rtl_TextEncodingInfo aInfo;
aInfo.StructSize = sizeof(rtl_TextEncodingInfo);
svxform::ODataAccessCharsetHelper aCSH;
@@ -171,6 +178,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
InsertTextEncoding( nEnc );
}
}
+#endif
}
//
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index fe1c254..c759aa0 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -85,21 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/config/optcomp \
sw/source/ui/config/optload \
sw/source/ui/config/optpage \
-sw/source/ui/dbui/addresslistdialog \
-sw/source/ui/dbui/createaddresslistdialog \
-sw/source/ui/dbui/customizeaddresslistdialog \
-sw/source/ui/dbui/dbinsdlg \
-sw/source/ui/dbui/dbtablepreviewdialog \
-sw/source/ui/dbui/mailmergewizard \
-sw/source/ui/dbui/mmaddressblockpage \
-sw/source/ui/dbui/mmdocselectpage \
-sw/source/ui/dbui/mmgreetingspage \
-sw/source/ui/dbui/mmlayoutpage \
-sw/source/ui/dbui/mmmergepage \
-sw/source/ui/dbui/mmoutputpage \
-sw/source/ui/dbui/mmoutputtypepage \
-sw/source/ui/dbui/mmpreparemergepage \
-sw/source/ui/dbui/selectdbtabledialog \
sw/source/ui/dialog/abstract \
sw/source/ui/dialog/addrdlg \
sw/source/ui/dialog/ascfldlg \
@@ -170,4 +155,24 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/utlui/swrenamexnameddlg \
))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_Library_add_exception_objects,swui,\
+sw/source/ui/dbui/addresslistdialog \
+sw/source/ui/dbui/createaddresslistdialog \
+sw/source/ui/dbui/customizeaddresslistdialog \
+sw/source/ui/dbui/dbinsdlg \
+sw/source/ui/dbui/dbtablepreviewdialog \
+sw/source/ui/dbui/mailmergewizard \
+sw/source/ui/dbui/mmaddressblockpage \
+sw/source/ui/dbui/mmdocselectpage \
+sw/source/ui/dbui/mmgreetingspage \
+sw/source/ui/dbui/mmlayoutpage \
+sw/source/ui/dbui/mmmergepage \
+sw/source/ui/dbui/mmoutputpage \
+sw/source/ui/dbui/mmoutputtypepage \
+sw/source/ui/dbui/mmpreparemergepage \
+sw/source/ui/dbui/selectdbtabledialog \
+))
+endif
+
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d281971d62cc52c496487933ec699605f1a9b209
Author: Cameron Paul
Date: Mon Feb 27 15:56:03 2012 +
fdo#46438 - add ctrl-g / ctrl-shift-g binding for find again fwd/back
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 16d4d55..c974a22 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -133,6 +133,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift();
+sal_Bool bMod1 = pKeyEvent->GetKeyCode().IsMod1();
sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode();
if ( KEY_ESCAPE == nCode )
@@ -156,7 +157,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
}
}
-if ( KEY_RETURN == nCode )
+if ( KEY_RETURN == nCode || (bMod1 && (KEY_G == nCode)) )
{
Remember_Impl(GetText());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/customshapes/EnhancedCustomShape2d.cxx |2 ++
svx/source/svdraw/svdoashp.cxx|2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 44b98b588c51c976c38b08844f7e09d236518e32
Author: Muthu Subramanian
Date: Mon Feb 27 18:03:21 2012 +0530
n742593: Adding checks before using textbox sizes.
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 3e5f340..3087526 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1193,6 +1193,8 @@ Rectangle EnhancedCustomShape2d::GetTextRect() const
}
Rectangle aRect( aTopLeft, aBottomRight );
OSL_TRACE("EnhancedCustomShape2d::GetTextRect: %d x %d", aRect.GetWidth(),
aRect.GetHeight());
+if( aRect.GetWidth() <= 1 || aRect.GetHeight() <= 1 )
+return aLogicRect;
aRect.Move( aLogicRect.Left(), aLogicRect.Top() );
aRect.Justify();
return aRect;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index aac2cf8..2cd4a04 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -556,7 +556,7 @@ sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle&
rTextBound ) const
if ( xCustomShapeEngine.is() )
{
awt::Rectangle aR( xCustomShapeEngine->getTextBounds() );
-if ( aR.Width || aR.Height )
+if ( aR.Width > 1 && aR.Height > 1 )
{
rTextBound = Rectangle( Point( aR.X, aR.Y ), Size( aR.Width,
aR.Height ) );
bRet = sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbcontrl.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 0175037f98bb27e1b217121539655e561b84fe1e
Author: Michael Meeks
Date: Tue Feb 21 16:54:13 2012 +
WaE: potentially uninitailized nMode
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5965dd4..d517780 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2255,14 +2255,15 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
// The following commands are available at the various modules
switch( nSlotId )
{
-case SID_ATTR_CHAR_COLOR2 :
-case SID_ATTR_CHAR_COLOR :
+case SID_ATTR_CHAR_COLOR:
+case SID_ATTR_CHAR_COLOR2:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:CharColorExt" )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
break;
-case SID_ATTR_CHAR_COLOR_BACKGROUND :
-case SID_BACKGROUND_COLOR :
+case SID_BACKGROUND_COLOR:
+case SID_ATTR_CHAR_COLOR_BACKGROUND:
+default:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:CharBackgroundExt" )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/engine3d/scene3d.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 967c82e9ce359ecb96982ece6d9e83f0771d8011
Author: David Tardon
Date: Tue Feb 21 06:21:15 2012 +0100
add missing semicolon
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 5081b50..805829f 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -224,7 +224,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes&
/*rDefault*/)
{
// For WIN95/NT turn off the FP-Exceptions
#if defined(WNT)
-_control87( _MCW_EM, _MCW_EM )
+_control87( _MCW_EM, _MCW_EM );
#endif
// Set defaults
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdotextpathdecomposition.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 1248e2af6a70c44651b74d2950aeabb64c1c70e7
Author: Josh Heidenreich
Date: Tue Feb 21 09:27:38 2012 +1030
Fixed a possible NULL-dereference found by cppcheck in svx
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx
b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 6488124..0276f05 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -361,15 +361,16 @@ namespace
{
const impPathTextPortion* pCandidate = rTextPortions[a];
basegfx::B2DVector aFontScaling;
-const drawinglayer::attribute::FontAttribute
aCandidateFontAttribute(
-drawinglayer::primitive2d::getFontAttributeFromVclFont(
-aFontScaling,
-pCandidate->getFont(),
-pCandidate->isRTL(),
-false));
if(pCandidate && pCandidate->getTextLength())
{
+const drawinglayer::attribute::FontAttribute
aCandidateFontAttribute(
+drawinglayer::primitive2d::getFontAttributeFromVclFont(
+aFontScaling,
+pCandidate->getFont(),
+pCandidate->isRTL(),
+false));
+
drawinglayer::primitive2d::TextLayouterDevice
aTextLayouter;
aTextLayouter.setFont(pCandidate->getFont());
xub_StrLen nUsedTextLength(0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/dialog/_contdlg.cxx | 65 -
1 file changed, 65 deletions(-)
New commits:
commit 600c27470380f80445fecb4b5691e0d11060494d
Author: Björgvin Ragnarsson
Date: Fri Feb 17 23:19:28 2012 +
Remove unused code in core/svx/source/dialog/_contdlg.cxx
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 576d06e..c96bbf7 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -195,64 +195,9 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const
Graphic& rGraphic,
return PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128,
pRect ) );
}
-void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic&
rGraphic,
- const MapUnit eUnit, const Size&
rDisplaySize )
-{
-DBG_ASSERT( rGraphic.GetType() != GRAPHIC_NONE, "Graphic is not valid!" );
-
-OutputDevice* pOutDev = Application::GetDefaultDevice();
-const MapMode aDispMap( eUnit );
-const MapMode aGrfMap( rGraphic.GetPrefMapMode() );
-const Size aGrfSize( rGraphic.GetPrefSize() );
-SizeaOrgSize;
-Point aNewPoint;
-sal_BoolbPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
-
-if ( bPixelMap )
-aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap );
-else
-aOrgSize = pOutDev->LogicToLogic( aGrfSize, aGrfMap, aDispMap );
-
-if ( aOrgSize.Width() && aOrgSize.Height() )
-{
-double fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width();
-double fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height();
-
-for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount;
j++ )
-{
-Polygon& rPoly = rContour[ j ];
-
-for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
-{
-if ( bPixelMap )
-aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap );
-else
-aNewPoint = pOutDev->LogicToLogic( rPoly[ i ], aGrfMap,
aDispMap );
-
-rPoly[ i ] = Point( FRound( aNewPoint.X() * fScaleX ), FRound(
aNewPoint.Y() * fScaleY ) );
-}
-}
-}
-}
-
// Loop through to super class, no virtual Methods to not become incompatible
// due to IF changes
-void SvxContourDlg::SetExecState( sal_Bool bEnable )
-{
-pSuperClass->SetExecState( bEnable );
-}
-
-void SvxContourDlg::SetGraphic( const Graphic& rGraphic )
-{
-pSuperClass->SetGraphic( rGraphic );
-}
-
-void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked )
-{
-pSuperClass->SetGraphicLinked( bGraphicLinked );
-}
-
const Graphic& SvxContourDlg::GetGraphic() const
{
return pSuperClass->GetGraphic();
@@ -263,21 +208,11 @@ sal_Bool SvxContourDlg::IsGraphicChanged() const
return pSuperClass->IsGraphicChanged();
}
-void SvxContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
-{
-pSuperClass->SetPolyPolygon( rPolyPoly );
-}
-
PolyPolygon SvxContourDlg::GetPolyPolygon()
{
return pSuperClass->GetPolyPolygon( sal_True );
}
-void SvxContourDlg::SetEditingObject( void* pObj )
-{
-pSuperClass->SetEditingObject( pObj );
-}
-
const void* SvxContourDlg::GetEditingObject() const
{
return pSuperClass->GetEditingObject();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdpagv.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit d5f9722e198cc8cc9e658207c73e465390c60c99 Author: Matúš Kukan Date: Sat Feb 11 20:07:01 2012 +0100 fix dbgutil build: put back DbgName_SdrPageView diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 399d7f0..fef1b10 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -66,6 +66,8 @@ using namespace ::com::sun::star; #include #include +DBG_NAME(SdrPageView); + // interface to SdrPageWindow ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/items/clipfmtitem.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit eb9054fbe9d13978862dab8d13923bf670e96c43
Author: Caolán McNamara
Date: Tue Jan 17 13:10:11 2012 +
fix crash double clicking rotated text in calc
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index a43f889..77273b3 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -112,13 +112,11 @@ int SvxClipboardFmtItem::operator==( const SfxPoolItem&
rComp ) const
return 0;
int nRet = 1;
-const String* pStr1, *pStr2;
for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.size(); n < nEnd; ++n )
{
if( pImpl->aFmtIds[ n ] != rCmp.pImpl->aFmtIds[ n ] ||
-( (0 == ( pStr1 = &(pImpl->aFmtNms[n]) )) ^
- (0 == ( pStr2 = &(rCmp.pImpl->aFmtNms[n]) ) )) ||
-( pStr1 && *pStr1 != *pStr2 ))
+( pImpl->aFmtNms.is_null(n) ^ rCmp.pImpl->aFmtNms.is_null(n) ) ||
+( !pImpl->aFmtNms.is_null(n) && pImpl->aFmtNms[n] !=
rCmp.pImpl->aFmtNms[n] ) )
{
nRet = 0;
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/items/clipfmtitem.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59cc5f6e39b7e81e4af245473f09c7446f6facfd
Author: August Sodora
Date: Wed Jan 11 23:02:11 2012 -0500
Fix build on MacOSX
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index d8f7f64..24f550c 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -34,7 +34,7 @@
struct SvxClipboardFmtItem_Impl
{
-boost::ptr_vector> aFmtNms;
+boost::ptr_vector< boost::nullable > aFmtNms;
std::vector aFmtIds;
static String sEmptyStr;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/items/pageitem.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit ba759d70ba84280ef5d25f644357e04471bffab9
Author: Ivan Timofeev
Date: Sat Jan 7 21:32:21 2012 +0200
Add a missing space in the format -> page -> organizer tab
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index b67d01f..cd9fef7 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -136,7 +136,12 @@ SfxItemPresentation SvxPageItem::GetPresentation
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
else
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE);
-rText += GetUsageText( eUse );
+String aUsageText = GetUsageText( eUse );
+if (aUsageText.Len())
+{
+rText += cpDelim;
+rText += aUsageText;
+}
return SFX_ITEM_PRESENTATION_NAMELESS;
}
case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -154,7 +159,12 @@ SfxItemPresentation SvxPageItem::GetPresentation
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE);
else
rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE);
-rText += GetUsageText( eUse );
+String aUsageText = GetUsageText( eUse );
+if (aUsageText.Len())
+{
+rText += cpDelim;
+rText += aUsageText;
+}
return SFX_ITEM_PRESENTATION_COMPLETE;
}
default: ;//prevent warning
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/customshapes/EnhancedCustomShape2d.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8edd479f579afe9b26790c99a9a6648261aec4e3 Author: Radek Doulik Date: Wed Jan 4 15:27:27 2012 +0100 move the assert checking the polygon count higher - so that it is called before accessing polygon points diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 0d9f9a3..f1fbf44 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1643,10 +1643,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm const Point aControl(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True )); const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ], sal_True, sal_True )); +DBG_ASSERT(aNewB2DPolygon.count(), "EnhancedCustomShape2d::CreateSubPath: Error in adding control point (!)"); basegfx::B2DPoint aStartPointB2D( aNewB2DPolygon.getB2DPoint(aNewB2DPolygon.count() - 1 ) ); Point aStartPoint( aStartPointB2D.getX(), aStartPointB2D.getY() ); -DBG_ASSERT(aNewB2DPolygon.count(), "EnhancedCustomShape2d::CreateSubPath: Error in adding control point (!)"); aNewB2DPolygon.appendBezierSegment( basegfx::B2DPoint(aStartPoint.X() + 2.0*(aControl.X() - aStartPoint.X())/3.0, aStartPoint.Y() + 2.0*(aControl.Y() - aStartPoint.Y())/3.0), basegfx::B2DPoint(aEnd.X() + 2.0*(aControl.X() - aEnd.X())/3.0, aEnd.Y() + 2.0*(aControl.Y() - aEnd.Y())/3.0), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/customshapes/EnhancedCustomShape2d.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 250f84daf8f443bf436e0a86c9a718c37749971a
Author: Radek Doulik
Date: Wed Jan 4 15:05:32 2012 +0100
implemented QUADRATICCURVETO case of custom shape paths
- convert them to cubic beziers, which we have in basegfx
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 2b2078a..0d9f9a3 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1637,10 +1637,20 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16&
rSrcPt, sal_uInt16& rSegm
}
break;
-case QUADRATICCURVETO : // TODO
+case QUADRATICCURVETO :
for ( sal_Int32 i(0L); ( i < nPntCount ) && ( rSrcPt + 1 <
nCoordSize ); i++ )
{
-rSrcPt += 2;
+const Point aControl(GetPoint( seqCoordinates[
rSrcPt++ ], sal_True, sal_True ));
+const Point aEnd(GetPoint( seqCoordinates[ rSrcPt++ ],
sal_True, sal_True ));
+
+basegfx::B2DPoint aStartPointB2D(
aNewB2DPolygon.getB2DPoint(aNewB2DPolygon.count() - 1 ) );
+Point aStartPoint( aStartPointB2D.getX(),
aStartPointB2D.getY() );
+
+DBG_ASSERT(aNewB2DPolygon.count(),
"EnhancedCustomShape2d::CreateSubPath: Error in adding control point (!)");
+aNewB2DPolygon.appendBezierSegment(
+basegfx::B2DPoint(aStartPoint.X() +
2.0*(aControl.X() - aStartPoint.X())/3.0, aStartPoint.Y() + 2.0*(aControl.Y() -
aStartPoint.Y())/3.0),
+basegfx::B2DPoint(aEnd.X() + 2.0*(aControl.X() -
aEnd.X())/3.0, aEnd.Y() + 2.0*(aControl.Y() - aEnd.Y())/3.0),
+basegfx::B2DPoint(aEnd.X(), aEnd.Y()));
}
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/fmcomp/gridctrl.src |2 +- svx/source/form/fmexpl.src |2 +- svx/source/form/formshell.src |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 7248aaed7aca6c241683f6d83bb6caa00c447b0d Author: David Tardon Date: Thu Dec 22 13:30:41 2011 +0100 we need to include the localized file This reverts commit 9d88c67c4cfa8e894d23ebe7924a9d630327ccda. diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index e5a0c9a..874f3ae 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -27,7 +27,7 @@ #include "svx/fmresids.hrc" #include -#include "globlmn_tmpl.hrc" +#include "globlmn.hrc" #include "fmhelp.hrc" #include diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index c6509d8..f4d56d3 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -28,7 +28,7 @@ #include #include "svx/fmresids.hrc" #include "fmexpl.hrc" -#include "globlmn_tmpl.hrc" +#include "globlmn.hrc" #include #include "fmhelp.hrc" diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index 881d13f..287f60a 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -29,7 +29,7 @@ #include #include #include -#include "globlmn_tmpl.hrc" +#include "globlmn.hrc" #include "helpid.hrc" #include "fmhelp.hrc" ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdmodel.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 53fb11622741354ee9ac0215ad246c07ead6 Author: Stephan Bergmann Date: Tue Dec 13 15:19:06 2011 +0100 Use officecfg/Office/Common.hxx directly. diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index b387f4c..92a8544 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -78,7 +78,7 @@ #include "svx/xflhtit.hxx" #include "svx/xlnclit.hxx" -#include +#include "officecfg/Office/Common.hxx" #include "editeng/fontitem.hxx" #include #include @@ -181,8 +181,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbAddExtLeading = sal_False; mnHandoutPageCount = 0; -SvxAsianConfig aAsian; -mnCharCompressType = aAsian.GetCharDistanceCompression(); +mnCharCompressType = officecfg::Office::Common::AsianLayout::CompressCharacterDistance::get(comphelper::getProcessComponentContext()); #ifdef OSL_LITENDIAN nStreamNumberFormat=NUMBERFORMAT_INT_LITTLEENDIAN; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdglue.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 59df2942aec0fd8123b15799c6375abc83b9937e
Author: Michael Meeks
Date: Mon Nov 28 16:48:17 2011 +
correct gluepoint sizing to match new 9x9 glue-points (thanks to Astron)
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index eac2430..69bd69c 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -32,7 +32,7 @@
#include
#include
-
+static const Size aGlueHalfSize(4,4);
void SdrGluePoint::SetReallyAbsolute(bool bOn, const SdrObject& rObj)
{
@@ -250,10 +250,13 @@ void SdrGluePoint::Invalidate(Window& rWin, const
SdrObject* pObj) const
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
aPt=rWin.LogicToPixel(aPt);
rWin.EnableMapMode(sal_False);
-long x=aPt.X(),y=aPt.Y(); // Size fixed to 7 pixels for now
+
+Size aSiz( aGlueHalfSize );
+Rectangle aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(),
+aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height());
// do not erase background, that causes flicker (!)
-rWin.Invalidate(Rectangle(Point(x-3,y-3),Point(x+3,y+3)),
INVALIDATE_NOERASE);
+rWin.Invalidate(aRect, INVALIDATE_NOERASE);
rWin.EnableMapMode(bMapMerk);
}
@@ -261,7 +264,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const
SdrObject* pObj) const
bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const
SdrObject* pObj) const
{
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
-Size aSiz=rOut.PixelToLogic(Size(3,3));
+Size aSiz=rOut.PixelToLogic(aGlueHalfSize);
Rectangle
aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(),aPt.X()+aSiz.Width(),aPt.Y()+aSiz.Height());
return aRect.IsInside(rPnt);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/sdr/overlay/overlaytools.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 616db52655b65201e60f53deb3a063b0fdd7cc6b Author: Tim Hardeck Date: Wed Nov 23 18:33:54 2011 +0100 Fixed wrong scaling of the anchor icons The size of the anchor icons, handles and similar were always one pixel too small which resulted in a blurry image. diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index cdaea55..f431ff2 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -72,8 +72,8 @@ namespace drawinglayer // and unrotated, more like a marker const double fLeft(((0.0 - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX()); const double fTop(((0.0 - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY()); -const double fRightaBitmapSize.getWidth() - 1.0) - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX()); -const double fBottomaBitmapSize.getHeight() - 1.0) - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY()); +const double fRight(((aBitmapSize.getWidth() - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX()); +const double fBottom(((aBitmapSize.getHeight() - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY()); // create a BitmapPrimitive2D using those positions basegfx::B2DHomMatrix aTransform; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/unodraw/unoshape.cxx | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 6cdbf1cc9bc3fd97acdba981bad04d552dafc627 Author: Stephan Bergmann Date: Wed Nov 23 11:44:55 2011 +0100 No more OSL_FORMAT. diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index b676551..eef6c80 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1720,10 +1720,12 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const throw beans::UnknownPropertyException(); if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 ) -throw beans::PropertyVetoException( rtl::OUString::createFromAscii( -OSL_FORMAT( "Readonly property can't be set: %s", -rtl::OUStringToOString( rPropertyName, RTL_TEXTENCODING_UTF8 ).getStr() ) ), -uno::Reference< drawing::XShape >( this ) ); +throw beans::PropertyVetoException( +( rtl::OUString( +RTL_CONSTASCII_USTRINGPARAM( +"Readonly property can't be set: " ) ) + + rPropertyName ), +uno::Reference< drawing::XShape >( this ) ); mpModel->SetChanged(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/stbctrls/pszctrl.cxx | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 4d399eea4283173d0b8c766376ad538f1e088d92
Author: Cor Nouws
Date: Mon Nov 21 14:23:29 2011 +0100
Updated transl. German comments - removd obsolete time/date comm
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 3b83715..ebaf1c0 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -171,7 +171,7 @@ struct SvxPosSizeStatusBarControl_Impl
/* [Description]
Ctor():
-Create an intance of the implementation class, enable the page numbering
by default
+Create an instance of the implementation class,
load the images for the position and size
*/
@@ -223,18 +223,16 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
NULL/Void SfxPointItemSvxSizeItem SfxStringItem
-Timesal_Truesal_False sal_False FALSE
Positionsal_False FALSE
SizeFALSE TRUEFALSE
Textsal_False sal_False TRUE
-Another item resulst in an assert, that enables showing of the time.
*/
void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState
eState,
const SfxPoolItem* pState )
{
-// the combi-controller, always set the curent Id as HelpId
+// Because the combi-controller, always sets the curent Id as HelpId
// first clean the cached HelpText
GetStatusBar().SetHelpText( GetId(), String() );
@@ -298,7 +296,6 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
else
{
DBG_ERRORFILE( "invalid item type" );
-// nevertheless show date and time
pImp->bPos = sal_False;
pImp->bSize = sal_False;
pImp->bTable = sal_False;
@@ -307,8 +304,8 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
if ( GetStatusBar().AreItemsVisible() )
GetStatusBar().SetItemData( GetId(), 0 );
-// set only strings as text at the statusBar, because the Help-Tips
-// functions, when the text is too long
+// set only strings as text at the statusBar, so that the Help-Tips
+// can work with the text, when it is too long for the statusBar
String aText;
if ( pImp->bTable )
aText = pImp->aStr;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/stbctrls/pszctrl.cxx | 103 +++
svx/source/stbctrls/stbctrls.src | 14 ++---
svx/source/stbctrls/zoomctrl.cxx | 16 --
3 files changed, 59 insertions(+), 74 deletions(-)
New commits:
commit 63b3301d78f10672d1ce11e144015d60707bfb87
Author: Cor Nouws
Date: Sat Nov 19 22:37:30 2011 +0100
Translation of German comments
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 8be9399..3b83715 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -62,21 +62,21 @@
// ---
-/* [Beschreibung]
+/* [Description]
-Funktion, mit der ein metrischer Wert in textueller Darstellung
-umgewandelt wird.
+Function used to create a text representation of
+a metric value
-nVal ist hier der metrische Wert in der Einheit eUnit.
+nVal is the metric value in the unit eUnit.
-[Querverweise]
+[cross reference]
*/
String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
{
-// Applikations-Metrik besorgen und setzen
+// deliver and set the Metric of the application
FieldUnit eOutUnit = SfxModule::GetModuleFieldUnit( getFrameInterface() );
FieldUnit eInUnit = FUNIT_100TH_MM;
@@ -143,36 +143,36 @@ void FunctionPopup_Impl::Select()
struct SvxPosSizeStatusBarControl_Impl
-/* [Beschreibung]
+/* [Description]
-Diese Implementations-Struktur der Klasse SvxPosSizeStatusBarControl
-dient der Entkopplung von "Anderungen vom exportierten Interface sowie
-der Verringerung von extern sichtbaren Symbolen.
+This implementation-structure of the class SvxPosSizeStatusBarControl
+is done for the un-linking of the changes of the exported interface such as
+the toning down of symbols that are visible externaly.
-Eine Instanz exisitiert pro SvxPosSizeStatusBarControl-Instanz
-f"ur deren Laufzeit.
+One instance exists for each SvxPosSizeStatusBarControl-instance
+during it's life time
*/
{
-Point aPos; // g"ultig, wenn eine Position angezeigt wird
-SizeaSize; // g"ultig, wenn eine Gr"o/se angezeigt wird
-String aStr; // g"ultig, wenn ein Text angezeigt wird
-sal_BoolbPos; // show position
-sal_BoolbSize; // Gr"o/se anzeigen?
-sal_BoolbTable; // Tabellenindex anzeigen?
-sal_BoolbHasMenu; // StarCalc Popup-Menue anzeigen?
-sal_uInt16 nFunction; // selektierte StarCalc Funktion
-Image aPosImage; // Image f"ur die Positionsanzeige
-Image aSizeImage; // Image f"ur die Gr"o/senanzeige
+Point aPos; // valid when a position is shown
+SizeaSize; // valid when a size is shown
+String aStr; // valid when a text is shown
+sal_BoolbPos; // show position ?
+sal_BoolbSize; // set size ?
+sal_BoolbTable; // set table index ?
+sal_BoolbHasMenu; // set StarCalc popup menu ?
+sal_uInt16 nFunction; // the selected StarCalc function
+Image aPosImage; // Image to show the position
+Image aSizeImage; // Image to show the size
};
// class SvxPosSizeStatusBarControl --
-/* [Beschreibung]
+/* [Description]
Ctor():
-Anlegen einer Impl-Klassen-Instanz, Default die Zeitanzeige enablen,
-Images fu"r die Position und Gro"sse laden.
+Create an intance of the implementation class, enable the page numbering
by default
+load the images for the position and size
*/
#define STR_POSITION ".uno:Position"
@@ -200,10 +200,11 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl(
sal_uInt16 _nSlotId,
// ---
-/* [Beschreibung]
+/* [Description]
Dtor():
-Pointer auf die Impl-Klasse lo"schen, damit der Timer gestoppt wird.
+remove the pointer to the implementation class, so that the timer is
stopped
+
*/
SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
@@ -213,28 +214,28 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
// ---
-/* [Beschreibung]
+/* [Description]
-SID_PSZ_FUNCTION aktiviert das Popup-Menue fuer Calc, ansonsten:
+SID_PSZ_FUNCTION activates the popup menu for Calc:
-Statusbenachrichtigung;
-Je nach Item-Typ wird eine bestimmte Anzeige enabled, die anderen disabled.
+Status overview
+Depending on the type of the item, a special setting is enabled, the
others disabled.
NULL/Void SfxPointItemSvxSizeItem SfxStringItem
-Zeitsal_Truesal_False sal_False FALSE
+Timesal_Truesal_False sal_False
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdundo.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit ea07e59bb9c49c67881b514ad5932fdd89218a70
Author: Muthu Subramanian
Date: Sat Nov 19 16:19:32 2011 +0530
Removing unreachable code.
pUndoSet is set to NULL at the beginning of the method.
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 154713d..5922779 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -305,11 +305,6 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool
bStyleSheet1, bool bSave
if(!bIsGroup || bIs3DScene)
{
-if(pUndoSet)
-{
-delete pUndoSet;
-}
-
pUndoSet = new SfxItemSet(pObj->GetMergedItemSet());
if(bStyleSheet)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/dialog/srchdlg.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit f684c33c9188937c1665b428e705e0ef1673cb11
Author: Caolán McNamara
Date: Wed Nov 16 16:35:11 2011 +
fix crashing search/replace dialog
Overenthuastic chainsawing from 7776ebfa63cec652131e2be61e2dc198648770db
removed pWindow = LAYOUT_THIS_WINDOW (dialog)
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 14aba87..a885b92 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2484,6 +2484,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window*
_pParent, sal_uInt16 nId
: SfxChildWindow( _pParent, nId )
, dialog (new SvxSearchDialog (_pParent, this, *pBindings))
{
+pWindow = dialog;
dialog->Initialize( pInfo );
pBindings->Update( SID_SEARCH_ITEM );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source unotools/source
svx/source/inc/clonelist.hxx |1
svx/source/svdraw/clonelist.cxx|5 ---
unotools/source/i18n/charclass.cxx | 53 -
3 files changed, 59 deletions(-)
New commits:
commit 3d223821a8a9dd83993626554041a95098f75ac5
Author: Emanuele Fia
Date: Thu Nov 3 21:29:14 2011 +0100
Removed unused code
diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx
index 3ed9156..d7ca903 100644
--- a/svx/source/inc/clonelist.hxx
+++ b/svx/source/inc/clonelist.hxx
@@ -46,7 +46,6 @@ class CloneList
public:
void AddPair(const SdrObject* pOriginal, SdrObject* pClone);
-sal_uInt32 Count() const;
const SdrObject* GetOriginal(sal_uInt32 nIndex) const;
SdrObject* GetClone(sal_uInt32 nIndex) const;
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index 22474e5..fc7a594 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -68,11 +68,6 @@ void CloneList::AddPair(const SdrObject* pOriginal,
SdrObject* pClone)
}
}
-sal_uInt32 CloneList::Count() const
-{
-return maOriginalList.size();
-}
-
const SdrObject* CloneList::GetOriginal(sal_uInt32 nIndex) const
{
return maOriginalList[nIndex];
diff --git a/unotools/source/i18n/charclass.cxx
b/unotools/source/i18n/charclass.cxx
index 5fcd2ae..fad144d 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -116,21 +116,6 @@ sal_Bool CharClass::isAsciiAlpha( const String& rStr )
}
-// static
-sal_Bool CharClass::isAsciiAlphaNumeric( const String& rStr )
-{
-if ( !rStr.Len() )
-return sal_False;
-register const sal_Unicode* p = rStr.GetBuffer();
-register const sal_Unicode* const pStop = p + rStr.Len();
-do
-{
-if ( !isAsciiAlphaNumeric( *p ) )
-return sal_False;
-} while ( ++p < pStop );
-return sal_True;
-}
-
sal_Bool CharClass::isAlpha( const String& rStr, xub_StrLen nPos ) const
{
@@ -154,22 +139,6 @@ sal_Bool CharClass::isAlpha( const String& rStr,
xub_StrLen nPos ) const
}
-sal_Bool CharClass::isAlpha( const String& rStr ) const
-{
-try
-{
-if ( xCC.is() )
-return isAlphaType( xCC->getStringType( rStr, 0, rStr.Len(),
getLocale() ) );
-else
-return sal_False;
-}
-catch ( const Exception& )
-{
-DBG_ERRORFILE( "isAlpha: Exception caught!" );
-return sal_False;
-}
-}
-
sal_Bool CharClass::isLetter( const String& rStr, xub_StrLen nPos ) const
{
@@ -271,23 +240,6 @@ sal_Bool CharClass::isAlphaNumeric( const String& rStr,
xub_StrLen nPos ) const
}
-sal_Bool CharClass::isAlphaNumeric( const String& rStr ) const
-{
-try
-{
-if ( xCC.is() )
-return isAlphaNumericType( xCC->getStringType( rStr, 0,
rStr.Len(), getLocale() ) );
-else
-return sal_False;
-}
-catch ( const Exception& )
-{
-DBG_ERRORFILE( "isAlphaNumeric: Exception caught!" );
-return sal_False;
-}
-}
-
-
sal_Bool CharClass::isLetterNumeric( const String& rStr, xub_StrLen nPos )
const
{
sal_Unicode c = rStr.GetChar( nPos );
@@ -336,11 +288,6 @@ String CharClass::toUpper( const String& rStr, xub_StrLen
nPos, xub_StrLen nCoun
return toUpper_rtl(rStr, nPos, nCount);
}
-void CharClass::toLower( rtl::OUString& rStr ) const
-{
-rStr = toLower_rtl(rStr, 0, rStr.getLength());
-}
-
String CharClass::toLower( const String& rStr, xub_StrLen nPos, xub_StrLen
nCount ) const
{
return toLower_rtl(::rtl::OUString(rStr), nPos, nCount);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdmrkv.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2ab818f8e9822ff027ad6c90e7b6fb1f4c089f9f
Author: Ivan Timofeev
Date: Wed Nov 2 15:55:28 2011 +0100
Fix i#89051: Move the point you've just inserted, not the previous one.
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index becc523..9dd2e62 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -802,12 +802,12 @@ void SdrMarkView::SetMarkHandles()
// Drehpunkt/Spiegelachse
AddDragModeHdl(eDragMode);
-// add custom handles (used by other apps, e.g. AnchorPos)
-AddCustomHdl();
-
// sort handles
aHdl.Sort();
+// add custom handles (used by other apps, e.g. AnchorPos)
+AddCustomHdl();
+
// #105722# try to restore focus handle index from remembered values
if(bSaveOldFocus)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdhdl.cxx | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 54c7480a6cdb049a5b0c907fa86af42068dcae16
Author: Michael Meeks
Date: Tue Nov 1 12:21:49 2011 +
add real alpha to markers
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 62ee66b..14f4289 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -101,18 +101,10 @@ public:
#define INDIVIDUAL_COUNT(4)
SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
-: maMarkersBitmap(),
+: maMarkersBitmap(ResId(nResId, *ImpGetResMgr())),
// 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
-maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
+maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
{
-// #101928# change color used for transparent parts to 0x00ff00ff
(ImageList standard)
-const Color aColTransparent(0x00ff00ff);
-const Bitmap aBitmap(ResId(nResId, *ImpGetResMgr()));
-const Bitmap aMask(aBitmap.CreateMask(aColTransparent));
-
-// create a real BitmapEx with an AlphaMask
-maMarkersBitmap = BitmapEx(aBitmap, aMask);
-// maMarkersBitmap = BitmapEx(aBitmap, aColTransparent);
}
SdrHdlBitmapSet::~SdrHdlBitmapSet()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source vcl/source
svx/source/form/filtnav.cxx |1
svx/source/unodraw/unoshape.cxx |4 -
vcl/source/control/field.cxx| 20
vcl/source/gdi/cvtsvm.cxx | 93
vcl/source/window/dockmgr.cxx |2
vcl/source/window/toolbox.cxx |8 ---
vcl/source/window/window.cxx| 79 -
7 files changed, 207 deletions(-)
New commits:
commit 87597b5d3d021be52f80639ef0487cf35a91ba85
Author: Takeshi Abe
Date: Thu Oct 27 01:24:48 2011 +0900
removed dead code
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 2acbc95..67f2645 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -70,7 +70,6 @@
#include
-#define SYNC_DELAY 200
#define DROP_ACTION_TIMER_INITIAL_TICKS 10
// solange dauert es, bis das Scrollen anspringt
#define DROP_ACTION_TIMER_SCROLL_TICKS 3
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 4fcce2a..e3bfaf3 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -118,10 +118,6 @@ using namespace ::com::sun::star::container;
using ::svx::PropertyValueProvider;
using ::svx::IPropertyValueProvider;
-#define QUERYINT( xint ) \
-if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
-aAny <<= uno::Reference< xint >(this)
-
class GDIMetaFile;
class SvStream;
sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream &
rTargetStream,
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index e34aa37..54e900c 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1112,26 +1112,6 @@ static XubString ImplMetricGetUnitText( const XubString&
rStr )
}
}
return aStr;
-
-/*
-// MT: #90545# Preparation for translated strings...
-String aMetricText;
-for ( sal_uInt16 n = rStr.Len(); n; )
-{
-sal_Unicode c = rStr.GetChar( --n );
-sal_Int32 nType = xCharClass->getStringType( rStr, n, 1, rLocale );
-
-if ( CharClass::isLetterType( nType ) )
-{
-aMetricText.Insert( c, 0 );
-}
-else
-{
-if ( aMetricText.Len() )
-break;
-}
-}
-*/
}
// ---
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 69579c9..e3d027e 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -44,12 +44,6 @@
#include
// ---
-// - Defines -
-// ---
-
-#define CVTSVM_WRITE_SUBACTIONCOUNT 1
-
-// ---
// - Inlines -
// ---
@@ -1223,9 +1217,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaTransparentAction( aPolyPoly,
nTrans ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1241,9 +1233,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaFloatTransparentAction( aMtf,
aPos, aSize, aGradient ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1257,9 +1247,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaHatchAction( aPolyPoly, aHatch ) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1273,9 +1261,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaRefPointAction( aRefPoint, bSet )
);
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
// #106172# Track font relevant data in shadow VDev
if( bSet )
@@ -1295,9 +1281,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf )
ImplSkipActions( rIStm, nFollowingActionCount );
rMtf.AddAction( new MetaTextLineColorAction( aColor, bSet
) );
-#ifdef CVTSVM_WRITE_SUBACTIONCOUNT
i += nFollowingActionCount;
-#endif
}
break;
@@ -1316,9 +1300,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf )
(FontUnderline)
nUnderline,
[Libreoffice-commits] .: svx/source
svx/source/dialog/docrecovery.cxx |2 --
svx/source/unodraw/unoshap2.cxx |3 ---
svx/source/unodraw/unoshap3.cxx |3 ---
3 files changed, 8 deletions(-)
New commits:
commit 0cb79e748687bcd3054cdcbf8961bc0b78279f85
Author: Takeshi Abe
Date: Tue Oct 18 20:40:16 2011 +0900
removed unused macro
diff --git a/svx/source/dialog/docrecovery.cxx
b/svx/source/dialog/docrecovery.cxx
index 8def4d8..8dec4c9 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -64,8 +64,6 @@
#include
#include
-#define RET_BACK100
-
//===
// namespace
namespace svx{
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 67a3110..8e597f7 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -82,9 +82,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
-#define INTERFACE_TYPE( xint ) \
-::getCppuType((const Reference< xint >*)0)
-
#define QUERYINT( xint ) \
if( rType == ::getCppuType((const Reference< xint >*)0) ) \
aAny <<= Reference< xint >(this)
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 5a0d631..659fe7f 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -67,9 +67,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
-#define INTERFACE_TYPE( xint ) \
-::getCppuType((const Reference< xint >*)0)
-
#define QUERYINT( xint ) \
if( rType == ::getCppuType((const Reference< xint >*)0) ) \
aAny <<= Reference< xint >(this)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/dialog/_contdlg.cxx | 21 --
svx/source/dialog/dlgunit.hxx | 47 +
svx/source/dialog/imapdlg.cxx | 17 --
3 files changed, 49 insertions(+), 36 deletions(-)
New commits:
commit ff9da5a017a56c06a644cf5da8d4a34f4b275df8
Author: Takeshi Abe
Date: Wed Oct 12 12:16:24 2011 +0900
extract a common inline function into header
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 8245faa..a100128 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -62,26 +62,7 @@
#include
#include "svx/dlgutil.hxx"
#include
-
-/**/
-
-inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode
cSep )
-{
-String aVal = UniString::CreateFromInt64( MetricField::ConvertValue(
nVal_100, 2, MAP_100TH_MM, eFieldUnit ) );
-
-while( aVal.Len() < 3 )
-aVal.Insert( sal_Unicode('0'), 0 );
-
-aVal.Insert( cSep, aVal.Len() - 2 );
-aVal += sal_Unicode(' ');
-aVal += SdrFormatter::GetUnitStr( eFieldUnit );
-
-return aVal;
-}
-
-
-/**/
-
+#include "dlgunit.hxx"
SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
new file mode 100644
index 000..3fcb099
--- /dev/null
+++ b/svx/source/dialog/dlgunit.hxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ *
+ * for a copy of the LGPLv3 License.
+ *
+ /
+#ifndef _SVX_DLG_DLGUNIT_HXX
+#define _SVX_DLG_DLGUNIT_HXX
+
+inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode
cSep )
+{
+String aVal = UniString::CreateFromInt64( MetricField::ConvertValue(
nVal_100, 2, MAP_100TH_MM, eFieldUnit ) );
+
+while( aVal.Len() < 3 )
+aVal.Insert( sal_Unicode('0'), 0 );
+
+aVal.Insert( cSep, aVal.Len() - 2 );
+aVal += sal_Unicode(' ');
+aVal += SdrFormatter::GetUnitStr( eFieldUnit );
+
+return aVal;
+}
+
+#endif // _SVX_DLG_DLGUNIT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 633c8a2..da9b35f 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -75,6 +75,7 @@
#include
#include
#include
+#include "dlgunit.hxx"
#define SELF_TARGET "_self"
#define IMAP_ALL_FILTER ""
@@ -93,22 +94,6 @@
SFX_IMPL_MODELESSDIALOG( SvxIMapDlgChildWindow, SID_IMAP );
-/**/
-
-inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode
cSep )
-{
-String aVal = UniString::CreateFromInt64( MetricField::ConvertValue(
nVal_100, 2, MAP_100TH_MM, eFieldUnit ) );
-
-while( aVal.Len() < 3 )
-aVal.Insert( sal_Unicode('0'), 0 );
-
-aVal.Insert( cSep, aVal.Len() - 2 );
-aVal += sal_Unicode(' ');
-aVal += SdrFormatter::GetUnitStr( eFieldUnit );
-
-return aVal;
-}
-
// ControllerItem
SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg,
SfxBindings& rBindings ) :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/linectrl.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 24bd2b363a8e9981a3583dfb190161ab335ee870
Author: Michael Meeks
Date: Sat Sep 24 11:33:38 2011 +0100
cleanup debug build pointer -> ref migration issues
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 2d419d2..fe54d1a 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -382,7 +382,6 @@ SvxLineEndWindow::SvxLineEndWindow(
SfxPopupWindow( nSlotId,
rFrame,
WinBits( WB_STDPOPUP ) ),
-pLineEndList(),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK |
WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
@@ -404,7 +403,6 @@ SvxLineEndWindow::SvxLineEndWindow(
rFrame,
pParentWindow,
WinBits( WB_STDPOPUP ) ),
-pLineEndList( NULL ),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK |
WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
@@ -435,7 +433,7 @@ void SvxLineEndWindow::implInit()
if( pItem )
nLineEndWidth = ( (SfxUInt16Item*) pItem )->GetValue();
}
-DBG_ASSERT( pLineEndList, "LineEndList wurde nicht gefunden" );
+DBG_ASSERT( pLineEndList.is(), "LineEndList wurde nicht gefunden" );
aLineEndSet.SetSelectHdl( LINK( this, SvxLineEndWindow, SelectHdl ) );
aLineEndSet.SetColCount( nCols );
@@ -669,7 +667,7 @@ void SvxLineEndWindow::StateChanged(
if ( pState && pState->ISA( SvxLineEndListItem ))
{
pLineEndList = ((SvxLineEndListItem*)pState)->GetLineEndList();
-DBG_ASSERT( pLineEndList, "LineEndList nicht gefunden" );
+DBG_ASSERT( pLineEndList.is(), "LineEndList nicht gefunden" );
aLineEndSet.Clear();
FillValueSet();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/xoutdev/xtable.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb2d27548d6db23630032f15985da980c6d53303 Author: Norbert Thiebaud Date: Sat Sep 24 04:14:19 2011 -0500 WaE unused debug-printf static variable diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 1aac0d8..100dbe4 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -46,7 +46,7 @@ Color RGB_Color( ColorData nColorName ) return aRGBColor; } -static int count = 0; +// static int count = 0; XPropertyList::XPropertyList( XPropertyListType type, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/xoutdev/xtable.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0f89219ff70eafbea0647ff6902eab22fc11081a
Author: Michael Meeks
Date: Sat Sep 24 08:45:08 2011 +0100
remove some stray debug fprintfs
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index fb0f77a..1aac0d8 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -70,12 +70,12 @@ XPropertyList::XPropertyList(
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
-fprintf (stderr, "Create type %d count %d\n", (int)eType, count++);
+//fprintf (stderr, "Create type %d count %d\n", (int)eType, count++);
}
XPropertyList::~XPropertyList()
{
-fprintf (stderr, "Destroy type %d count %d\n", (int)eType, --count);
+//fprintf (stderr, "Destroy type %d count %d\n", (int)eType, --count);
for( size_t i = 0, n = aList.size(); i < n; ++i )
delete aList[ i ];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
