[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 59 commits - basctl/source bin/module-deps.pl canvas/source chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk comphelper/source configmgr/source configure.ac connectivity/source cppcanvas/source cui/source cui/uiconfig cui/UIConfig_cui.mk dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source extras/source forms/source framework/source .gitignore helpcontent2 i18nlangtag/source include/connectivity include/i18nlangtag include/sax include/sfx2 include/svtools include/svx include/tools ios/iosremote librelogo/source libvisio/libvisio-0.0.30-msvc.patch.1 libvisio/UnpackedTarball_libvisio.mk lingucomponent/source linguistic/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk officecfg/registry oox/source qadevOOo/tests reportdesign/source sax/qa sax/source sc/AllLangResTarget_sc.mk sc/inc sc/Library_sc.mk scripting/source sc/sdi sc/so urce sc/uiconfig sc/UIConfig_scalc.mk sd/source sfx2/source slideshow/source slideshow/test solenv/gbuild soltools/cpp starmath/inc starmath/source svl/source svtools/langsupport svtools/source svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk sw/inc sw/qa sw/source sw/uiconfig toolkit/source tools/source ucb/source unotools/source unusedcode.easy vcl/aqua vcl/coretext vcl/inc vcl/source vcl/win writerfilter/source xmloff/source xmlscript/source
Kohei Yoshida
kohei.yoshida at gmail.com
Mon Jul 15 08:54:55 PDT 2013
Rebased ref, commits from common ancestor:
commit 800b3667892840a3ab3a26b2d1baa9bc5ceb69a1
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Jul 15 11:30:40 2013 -0400
Example code on how to handle input and output for matrix inversion.
Right now this code simply puts the original matrix values back. Re-write
this code to perform inversion for real.
Change-Id: I0330db77b000ed14cc810cc3ddf616e56d036c1b
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index dee465e..c24f13a 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -57,9 +57,43 @@ public:
const ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode);
};
-ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix& /* rMat */)
+ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix(const ScMatrix& rMat)
{
- return ScMatrixRef();
+ SCSIZE nC, nR;
+ rMat.GetDimensions(nC, nR);
+ if (nC != nR || nC == 0)
+ // Input matrix must be square. Return an empty matrix on failure and
+ // the caller will calculate it via CPU.
+ return ScMatrixRef();
+
+ // This vector will contain a series of doubles from the first column to
+ // the last, chained together in a single array.
+ std::vector<double> aDoubles;
+ rMat.GetDoubleArray(aDoubles);
+
+ // TODO: Inverse this matrix and put the result back into xInv. Right now,
+ // I'll just put the original, non-inversed matrix values back, just to
+ // demonstrate how to put the values back after inversion. There are two
+ // ways to put the values back (depending on what the GPU output is).
+ ScMatrixRef xInv(new ScMatrix(nR, nR, 0.0));
+
+#if 0
+ // One way is to put the whole value as one array. This method assumes
+ // that the array size equals column x row, and is oriented column-wise.
+ // This method is slightly more efficient than the second, but I wouldn't
+ // expect too much of a difference.
+ xInv->PutDouble(&aDoubles[0], aDoubles.size(), 0, 0);
+#else
+ // Another way is to put the values one column at a time.
+ const double* p = &aDoubles[0];
+ for (SCSIZE i = 0; i < nC; ++i)
+ {
+ xInv->PutDouble(p, nR, i, 0);
+ p += nR;
+ }
+#endif
+
+ return xInv;
}
bool FormulaGroupInterpreterOpenCL::interpret(ScDocument& rDoc, const ScAddress& rTopPos,
commit 114edb760079ca6ad0791db30c75394cf6f634e9
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jul 15 17:32:40 2013 +0200
Enable sidebar by default when the Experimental Sidebar is put to 'on'.
Change-Id: I525f15bc3f6b40522bf0dce754dd8e99386cd775
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index bd3a06b..65d02dd 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -24,5 +24,12 @@
<value>false</value>
</prop>
</node>
+
+ <!-- show Sidebar child window by default (when enabled via the Experimental settings) - oor:name == SID_SIDEBAR -->
+ <node oor:name="10336" oor:op="replace">
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
</node>
</oor:component-data>
commit 7650a82702ec9d13e3a52ea84b9666ee4e9f9a62
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Sat Jul 13 15:08:03 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: I85a3cfeac16e2c8e20724e1f6a5dd16c2c143a49
Reviewed-on: https://gerrit.libreoffice.org/4882
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 8b49d62..76d533e 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -321,7 +321,6 @@
#include <rtl/crc.h>
#include <rtl/digest.h>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <rtl/math.h>
#include <rtl/math.hxx>
#include <rtl/process.h>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index e2766b0..f9d571f 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -145,7 +145,7 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
int ImplSVMain()
{
// The 'real' SVMain()
- RTL_LOGFILE_CONTEXT( aLog, "vcl (ss112471) ::SVMain" );
+ SAL_INFO( "vcl.app", "vcl (ss112471) ::SVMain" );
ImplSVData* pSVData = ImplGetSVData();
@@ -241,7 +241,7 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Nam
bool InitVCL()
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl (ss112471) ::InitVCL" );
+ SAL_INFO( "vcl.app", "vcl (ss112471) ::InitVCL" );
if( pExceptionHandler != NULL )
return false;
@@ -266,11 +266,11 @@ bool InitVCL()
pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier();
// Initialize Sal
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ ::CreateSalInstance" );
+ SAL_INFO( "vcl.app", "{ ::CreateSalInstance" );
pSVData->mpDefInst = CreateSalInstance();
if ( !pSVData->mpDefInst )
return false;
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "} ::CreateSalInstance" );
+ SAL_INFO( "vcl.app", "} ::CreateSalInstance" );
// Desktop Environment context (to be able to get value of "system.desktop-environment" as soon as possible)
com::sun::star::uno::setCurrentContext(
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index eb38d56..650609c 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -57,7 +57,6 @@
#include <unotools/localfilehelper.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/instance.hxx>
-#include <rtl/logfile.hxx>
#include <vcl/metaact.hxx>
#include <vector>
@@ -1739,7 +1738,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
return GRFILTER_FORMATERROR;
#else
- RTL_LOGFILE_CONTEXT( aLog, "GraphicFilter::ExportGraphic() (thb)" );
+ SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID" );
bool bAlreadyExists = DirEntryExists( rPath );
@@ -1789,7 +1788,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
return GRFILTER_FORMATERROR;
#else
- RTL_LOGFILE_CONTEXT( aLog, "GraphicFilter::ExportGraphic() (thb)" );
+ SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
sal_uInt16 nFormatCount = GetExportFormatCount();
ResetLastError();
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index e508b2c..0e33a63 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -20,7 +20,6 @@
#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
-#include <rtl/logfile.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
@@ -296,7 +295,7 @@ ImageList::ImageList( const ResId& rResId ) :
mnInitSize( 1 ),
mnGrowSize( 4 )
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::ImageList( const ResId& rResId )" );
+ SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" );
DBG_CTOR( ImageList, NULL );
@@ -346,7 +345,7 @@ ImageList::ImageList( const ::std::vector< OUString >& rNameVector,
mnInitSize( 1 ),
mnGrowSize( 4 )
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::ImageList(const vector< OUString >& ..." );
+ SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >& ..." );
DBG_CTOR( ImageList, NULL );
@@ -675,7 +674,7 @@ OUString ImageList::GetImageName( sal_uInt16 nPos ) const
void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::GetImageNames" );
+ SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" );
DBG_CHKTHIS( ImageList, NULL );
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 8f67176..e023c81 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2833,7 +2833,7 @@ void OutputDevice::ImplInitFontList() const
{
if( mpGraphics || ImplGetGraphics() )
{
- RTL_LOGFILE_CONTEXT( aLog, "OutputDevice::ImplInitFontList()" );
+ SAL_INFO( "vcl.gdi", "OutputDevice::ImplInitFontList()" );
mpGraphics->GetDevFontList( mpFontList );
}
}
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 9ba85d0..519f97f 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -18,7 +18,6 @@
*/
-#include <rtl/logfile.hxx>
#include <cppuhelper/compbase1.hxx>
#include <com/sun/star/geometry/RealSize2D.hpp>
@@ -73,7 +72,7 @@ namespace vcl
uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/,
const ::BitmapEx& inputBitmap )
{
- RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xBitmapFromBitmapEx()" );
+ SAL_INFO( "vcl.helper", "::vcl::unotools::xBitmapFromBitmapEx()" );
return new vcl::unotools::VclCanvasBitmap( inputBitmap );
}
@@ -189,7 +188,7 @@ namespace vcl
::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const uno::Reference< rendering::XIntegerReadOnlyBitmap >& xInputBitmap )
{
- RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::bitmapExFromXBitmap()" );
+ SAL_INFO( "vcl.helper", "::vcl::unotools::bitmapExFromXBitmap()" );
if( !xInputBitmap.is() )
return ::BitmapEx();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 1a9d585..c4be486 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -18,7 +18,6 @@
*/
-#include <rtl/logfile.hxx>
#include <tools/debug.hxx>
#include <tools/rc.h>
@@ -1642,7 +1641,7 @@ ToolBox::ToolBox( Window* pParent, WinBits nStyle ) :
ToolBox::ToolBox( Window* pParent, const ResId& rResId ) :
DockingWindow( WINDOW_TOOLBOX )
{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ToolBox::ToolBox( Window* pParent, const ResId& rResId )" );
+ SAL_INFO( "vcl.window", "vcl: ToolBox::ToolBox( Window* pParent, const ResId& rResId )" );
rResId.SetRT( RSC_TOOLBOX );
WinBits nStyle = ImplInitRes( rResId );
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 33e6493..aa049da 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2112,7 +2112,7 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL,
bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
const OUString& rFontFileURL, const OUString& rFontName )
{
- RTL_LOGFILE_TRACE1( "WinSalGraphics::AddTempDevFont(): %s", OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO( "vcl.gdi", "WinSalGraphics::AddTempDevFont(): " << OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() );
ImplDevFontAttributes aDFA;
aDFA.SetFamilyName(rFontName);
@@ -2703,7 +2703,6 @@ sal_Bool WinSalGraphics::CreateFontSubset( const OUString& rToFile,
return (nRC == SF_OK);
}
-//--------------------------------------------------------------------------
const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont,
const sal_Unicode* pUnicodes, sal_Int32* pCharWidths,
@@ -2760,14 +2759,12 @@ const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont,
return (void*)pData;
}
-//--------------------------------------------------------------------------
void WinSalGraphics::FreeEmbedFontData( const void* pData, long /*nLen*/ )
{
delete[] reinterpret_cast<char*>(const_cast<void*>(pData));
}
-//--------------------------------------------------------------------------
const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
@@ -2794,7 +2791,6 @@ const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const PhysicalFontFace
return pEncoding;
}
-//--------------------------------------------------------------------------
void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
@@ -2888,12 +2884,10 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
}
}
-//--------------------------------------------------------------------------
void WinSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
{}
-//--------------------------------------------------------------------------
SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const
{
@@ -2910,6 +2904,5 @@ SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const
return aSysFontData;
}
-//--------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 02c1f4128b2011ceea6e4a0ceb054ec74315ec54
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Jun 23 23:46:05 2013 +0200
Reduce scope of global array and make in constant
Change-Id: I914aff27234e3acede7ae6ade72530dc0fea9dc9
Reviewed-on: https://gerrit.libreoffice.org/4922
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 06e3f80..53ab826 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -218,8 +218,6 @@ enum SwDateTimeSubType
};
-extern sal_uInt16 aTypeTab[];
-
/// General tools.
String GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const String& rStr);
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index d6bdb92..524e185 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -70,7 +70,10 @@ static sal_uInt16 lcl_GetLanguageOfFormat( sal_uInt16 nLng, sal_uLong nFmt,
/// field names
std::vector<String>* SwFieldType::pFldNames = 0;
- sal_uInt16 aTypeTab[] = {
+namespace
+{
+
+ const sal_uInt16 aTypeTab[] = {
/* RES_DBFLD */ TYP_DBFLD,
/* RES_USERFLD */ TYP_USERFLD,
/* RES_FILENAMEFLD */ TYP_FILENAMEFLD,
@@ -113,6 +116,8 @@ std::vector<String>* SwFieldType::pFldNames = 0;
/* RES_DROPDOWN */ TYP_DROPDOWN
};
+}
+
const String& SwFieldType::GetTypeStr(sal_uInt16 nTypeId)
{
if( !pFldNames )
commit 5f3d88a1f151e12061421751831b5588495199bb
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jul 15 13:48:42 2013 +0200
sidebar: Further cleanup of AreaPropertyPanel.
Change-Id: I8cbb4bf4dfed2689d21247f1abb7d024d4995cbb
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 2e54ba4..b57e02f 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -233,7 +233,6 @@
#define RID_POPUPPANEL_TEXTPAGE_FONT_COLOR (RID_SVX_START + 316)
#define RID_POPUPPANEL_TEXTPAGE_SPACING (RID_SVX_START + 317)
-#define RID_SIDEBAR_AREA_PANEL (RID_SVX_START + 318)
#define RID_POPUPPANEL_AERAPAGE_COLOR (RID_SVX_START + 319)
#define RID_POPUPPANEL_AREAPAGE_TRGR (RID_SVX_START + 320)
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 359beef..0290428 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -100,8 +100,6 @@ AreaPropertyPanel::AreaPropertyPanel(
maImgSquare(SVX_RES(IMG_SQUARE)),
maImgLinear(SVX_RES(IMG_LINEAR)),
maImgColor(SVX_RES(IMG_COLOR)),
- msHelpFillType(SVX_RES(STR_HELP_TYPE)),
- msHelpFillAttr(SVX_RES(STR_HELP_ATTR)),
maTrGrPopup(this, ::boost::bind(&AreaPropertyPanel::CreateTransparencyGradientControl, this, _1)),
maColorPopup(this, ::boost::bind(&AreaPropertyPanel::CreateColorPopupControl, this, _1)),
mpFloatTransparenceItem(),
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc
index 5c9def0..7112ab4 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hrc
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc
@@ -15,17 +15,15 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// RID_SIDEBAR_AREA_PANEL--------------------------------------------------------------
#include "svx/dialogs.hrc"
#define TBI_LEFT 1
#define TBI_RIGHT 1
-#define TBI_BTX_GRADIENT 51
-#define LB_TRGR_TYPES 6
+#define VS_COLOR 1
+
#define MTR_TRANSPARENT 7
-#define BTN_GRADIENT 8
#define FT_TRGR_CENTER_X 9
#define MTR_TRGR_CENTER_X 10
@@ -57,10 +55,6 @@
#define IMG_ROT_LEFT (RID_SVX_SIDEBAR_BEGIN + 37)
#define IMG_ROT_RIGHT (RID_SVX_SIDEBAR_BEGIN + 38)
-#define STR_HELP_TYPE (RID_SVX_SIDEBAR_BEGIN + 39)
-#define STR_HELP_ATTR (RID_SVX_SIDEBAR_BEGIN + 40)
-#define VS_COLOR (RID_SVX_SIDEBAR_BEGIN + 41)
-
#define STR_HELP_COLOR 41
#define FIXED_TEXT_HEIGHT 9
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src
index 353e125..244b304 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -60,16 +60,6 @@ Image IMG_ROT_RIGHT
ImageBitmap = Bitmap{File = "symphony/rotate_right.png";};
};
-Control RID_SIDEBAR_AREA_PANEL
-{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
- Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + SECTIONPAGE_MARGIN_VERTICAL_BOT + 2*( FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT) + CONTROL_SPACING_VERTICAL );
- HelpID = HID_PROPERTYPANEL_AREA_SECTION ;
- Text [ en-US ] = "Area";
-};
-
Control RID_POPUPPANEL_AREAPAGE_TRGR
{
OutputSize = TRUE;
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 2b2e247..8e591c6 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -93,6 +93,9 @@
<object class="svxlo-SvxFillAttrBox" id="fillattr">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the effect to apply.</property>
+ <property name="tooltip_text" translatable="yes">Select the effect to apply.</property>
</object>
<packing>
<property name="expand">False</property>
commit 94c8113897d9fc7f56a43dba4cc1331d758e46a7
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jul 15 13:37:39 2013 +0200
sidebar: Get AreaPropertyPanel basically to work.
Change-Id: Ib5f05346ab5b38b4f3ec30f95b2435c9231d13ab
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 3f18a94..2e54ba4 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1004,9 +1004,6 @@
// sidebar-related resources (defined in the appropriate .hrc's)
#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1240)
-// sidebar-related resources (defined in the appropriate .hrc's)
-#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1240)
-
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1270)
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 40330ae..359beef 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -77,8 +77,6 @@ AreaPropertyPanel::AreaPropertyPanel(
maGradientElliptical(),
maGradientSquare(),
maGradientRect(),
- mpLbFillType(new SvxFillTypeBox(this)),
- mpLbFillAttr(new SvxFillAttrBox(this)),
mpStyleItem(),
mpColorItem(),
mpFillGradientItem(),
@@ -113,11 +111,13 @@ AreaPropertyPanel::AreaPropertyPanel(
mbColorAvail(true)
{
get(mpColorTextFT, "filllabel");
+ get(mpLbFillType, "fillstyle");
+ get(mpLbFillAttr, "fillattr");
get(mpTrspTextFT, "transparencylabel");
get(mpToolBoxColor, "selectcolor");
get(mpLBTransType, "transtype");
- get(mpMTRTransparent, "settransparency"); // GtkSpinButton
- get(mpBTNGradient, "selectgradient"); // GtkToolbar
+ get(mpMTRTransparent, "settransparency");
+ get(mpBTNGradient, "selectgradient");
const sal_uInt16 nIdColor = mpToolBoxColor->GetItemId(UNO_SIDEBARCOLOR);
mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, nIdColor, mpToolBoxColor)),
@@ -158,27 +158,6 @@ void AreaPropertyPanel::Initialize()
maGradientRect = maGradientLinear;
maGradientRect.SetGradientStyle(XGRAD_RECT);
- Size aLogicalFillSize(MBOX_WIDTH,LISTBOX_HEIGHT);
- Size aLogicalAttrSize(MBOX_WIDTH + 1,LISTBOX_HEIGHT);
-
- Point aPoint(SECTIONPAGE_MARGIN_HORIZONTAL,SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL);
- Point aPoint_Picker(SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL,SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL);
-
- Size aTypeSize(LogicToPixel(aLogicalFillSize, MAP_APPFONT));
- Size aAttrSize(LogicToPixel(aLogicalAttrSize, MAP_APPFONT));
-
- Point aTypePoint(LogicToPixel(aPoint, MAP_APPFONT));
- Point aAttrPoint(LogicToPixel(aPoint_Picker, MAP_APPFONT));
-
- mpLbFillType->SetPosSizePixel(aTypePoint,aTypeSize);
- mpLbFillAttr->SetPosSizePixel(aAttrPoint,aAttrSize);
-
- mpLbFillType->SetHelpId(HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES);
- mpLbFillAttr->SetHelpId(HID_PPROPERTYPANEL_AREA_LB_FILL_ATTR);
-
- mpLbFillType->SetQuickHelpText(msHelpFillType);
- mpLbFillAttr->SetQuickHelpText(msHelpFillAttr);
-
mpLbFillType->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fill"))); //wj acc
mpLbFillAttr->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fill"))); //wj acc
@@ -195,12 +174,6 @@ void AreaPropertyPanel::Initialize()
mpToolBoxColor->SetItemBits( nIdColor, mpToolBoxColor->GetItemBits( nIdColor ) | TIB_DROPDOWNONLY );
mpToolBoxColor->SetItemText(nIdColor, msHelpFillAttr);
- long aHeightLBStyle = mpLbFillType->GetSizePixel().getHeight();
- long aLBPosY = mpLbFillType->GetPosPixel().getY();
- long aHeightTBAttr = mpToolBoxColor->GetSizePixel().getHeight();
- Point aPointTBAttr = mpToolBoxColor->GetPosPixel();
- aPointTBAttr.setY( aLBPosY + aHeightLBStyle / 2 - aHeightTBAttr / 2);
-
aLink = LINK(this, AreaPropertyPanel, ToolBoxColorDropHdl);
mpToolBoxColor->SetDropdownClickHdl ( aLink );
mpToolBoxColor->SetSelectHdl ( aLink );
@@ -221,19 +194,8 @@ void AreaPropertyPanel::Initialize()
mpBTNGradient->SetItemImage(nIdGradient,maImgLinear);
mpBTNGradient->Hide();
- long aHeightLBTrans = mpLBTransType->GetSizePixel().getHeight();
- Point aPointLB = mpLBTransType->GetPosPixel();
- long aPosY = aPointLB.getY();
-
- Point aPointMetric = mpMTRTransparent->GetPosPixel();
- Point aPointTB = mpMTRTransparent->GetPosPixel();
- long aHeightMetric = mpMTRTransparent->GetSizePixel().getHeight();
- long aHeightTool = mpBTNGradient->GetSizePixel().getHeight();
- aPointMetric.setY(aPosY+aHeightLBTrans/2-aHeightMetric/2);
- aPointTB.setY(aPosY+aHeightLBTrans/2-aHeightTool/2);
- aPointTB.setX(aPointTB.getX()+3);
mpLbFillType->SetAccessibleRelationLabeledBy(mpColorTextFT);
- mpLbFillAttr->SetAccessibleRelationLabeledBy(mpLbFillAttr.get());
+ mpLbFillAttr->SetAccessibleRelationLabeledBy(mpLbFillAttr);
mpToolBoxColor->SetAccessibleRelationLabeledBy(mpToolBoxColor);
mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT);
mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent);
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index d0df11a..39cbafc 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -99,14 +99,14 @@ private:
XGradient maGradientRect;
//ui controls
- FixedText* mpColorTextFT;
- ::boost::scoped_ptr< SvxFillTypeBox > mpLbFillType;
- ::boost::scoped_ptr< SvxFillAttrBox > mpLbFillAttr;
- ToolBox* mpToolBoxColor; // for new color picker
- FixedText* mpTrspTextFT;
- ListBox* mpLBTransType;
- MetricField* mpMTRTransparent;
- ToolBox* mpBTNGradient;
+ FixedText* mpColorTextFT;
+ SvxFillTypeBox* mpLbFillType;
+ SvxFillAttrBox* mpLbFillAttr;
+ ToolBox* mpToolBoxColor; // for new color picker
+ FixedText* mpTrspTextFT;
+ ListBox* mpLBTransType;
+ MetricField* mpMTRTransparent;
+ ToolBox* mpBTNGradient;
::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index dbc2ede..10ec85d 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -609,6 +609,11 @@ SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) :
Show();
}
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillTypeBox(Window *pParent, VclBuilder::stringmap &)
+{
+ return new SvxFillTypeBox(pParent);
+}
+
// -----------------------------------------------------------------------
SvxFillTypeBox::~SvxFillTypeBox()
@@ -697,6 +702,11 @@ SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) :
Show();
}
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillAttrBox(Window *pParent, VclBuilder::stringmap &)
+{
+ return new SvxFillAttrBox(pParent);
+}
+
// -----------------------------------------------------------------------
SvxFillAttrBox::~SvxFillAttrBox()
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index fe5c29b..2b2e247 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -15,74 +15,84 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkLabel" id="filllabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Fill:</property>
+ <property name="tooltip_text" translatable="yes">Fill:</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Fill:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">fillstyle</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-SvxFillTypeBox" id="fillstyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the fill type to apply.</property>
+ <property name="tooltip_text" translatable="yes">Select the fill type to apply.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
- <object class="GtkLabel" id="filllabel">
+ <object class="GtkToolbar" id="selectcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Fill:</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Fill:</property>
- <property name="use_underline">True</property>
+ <child>
+ <object class="GtkMenuToolButton" id="color">
+ <property name="width_request">105</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the color to apply.</property>
+ <property name="tooltip_text" translatable="yes">Select the color to apply.</property>
+ <property name="action_name">.uno:sidebarcolor</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="svxlo-SvxFillAttrBox" id="fillattr">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_bottom">4</property>
- <child>
- <object class="GtkComboBoxText" id="fillstyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the fill type to apply.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="selectcolor">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuToolButton" id="color">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the color to apply.</property>
- <property name="halign">end</property>
- <property name="action_name">.uno:sidebarcolor</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -92,24 +102,82 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkLabel" id="transparencylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Transparency</property>
+ <property name="tooltip_text" translatable="yes">Transparency</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Transparency:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">transtype</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="transtype">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the type of transparence to apply.</property>
+ <property name="tooltip_text" translatable="yes">Select the type of transparence to apply.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">None</item>
+ <item translatable="yes">Solid</item>
+ <item translatable="yes">Linear</item>
+ <item translatable="yes">Axial</item>
+ <item translatable="yes">Radial</item>
+ <item translatable="yes">Ellipsoid</item>
+ <item translatable="yes">Quadratic</item>
+ <item translatable="yes">Square</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
- <object class="GtkLabel" id="transparencylabel">
+ <object class="GtkToolbar" id="selectgradient">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Transparency</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Transparency:</property>
- <property name="use_underline">True</property>
+ <child>
+ <object class="GtkMenuToolButton" id="gradient">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the variation of gradient transparency.</property>
+ <property name="tooltip_text" translatable="yes">Specify the variation of gradient transparency.</property>
+ <property name="action_name">.uno:sidebargradient</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -118,93 +186,19 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkSpinButton" id="settransparency:0%">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkComboBoxText" id="transtype">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_markup" translatable="yes">Select the type of transparence to apply.</property>
- <property name="tooltip_text" translatable="yes">Select the type of transparence to apply.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">None</item>
- <item translatable="yes">Solid</item>
- <item translatable="yes">Linear</item>
- <item translatable="yes">Axial</item>
- <item translatable="yes">Radial</item>
- <item translatable="yes">Ellipsoid</item>
- <item translatable="yes">Quadratic</item>
- <item translatable="yes">Square</item>
- </items>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkSpinButton" id="settransparency:0%">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
- <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
- <property name="halign">end</property>
- <property name="max_length">100</property>
- <property name="invisible_char">•</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="climb_rate">5</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="selectgradient">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="margin_left">13</property>
- <child>
- <object class="GtkMenuToolButton" id="gradient">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Specify the variation of gradient transparency.</property>
- <property name="tooltip_text" translatable="yes">Specify the variation of gradient transparency.</property>
- <property name="margin_left">23</property>
- <property name="action_name">.uno:sidebargradient</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+ <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+ <property name="hexpand">True</property>
+ <property name="max_length">100</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="climb_rate">5</property>
+ <property name="numeric">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -214,11 +208,18 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
commit 8fe5f011537d3eaf2e6bb59ab8672b8de5b41425
Author: Prashant Pandey <prashant3.yishu at gmail.com>
Date: Tue Jul 2 00:00:32 2013 +0530
sidebar: AreaPropertyPanel conversion to .ui
Change-Id: I1c291b3806a483a7ce50c64d0fbf2f28204c132e
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 2e54ba4..3f18a94 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1004,6 +1004,9 @@
// sidebar-related resources (defined in the appropriate .hrc's)
#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1240)
+// sidebar-related resources (defined in the appropriate .hrc's)
+#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1240)
+
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1270)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f1fa287..74bff09 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
+ svx/uiconfig/ui/sidebararea \
svx/uiconfig/ui/sidebarline \
svx/uiconfig/ui/sidebarparagraph \
svx/uiconfig/ui/sidebartextpanel \
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 4046d42..40330ae 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -45,10 +45,10 @@ using namespace css;
using namespace cssu;
using ::sfx2::sidebar::Theme;
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
-
+const char UNO_SIDEBARCOLOR[] = ".uno:sidebarcolor";
+const char UNO_SIDEBARGRADIENT[] = ".uno:sidebargradient";
+#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
namespace svx { namespace sidebar {
@@ -64,7 +64,7 @@ AreaPropertyPanel::AreaPropertyPanel(
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
- : Control(pParent, SVX_RES(RID_SIDEBAR_AREA_PANEL)),
+ : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame),
meLastXFS(-1),
maLastColor(Color(COL_DEFAULT_SHAPE_FILLING)),
mnLastPosGradient(0),
@@ -77,17 +77,8 @@ AreaPropertyPanel::AreaPropertyPanel(
maGradientElliptical(),
maGradientSquare(),
maGradientRect(),
- mpColorTextFT(new FixedText(this, SVX_RES(FT_COLOR_LIST))),
mpLbFillType(new SvxFillTypeBox(this)),
mpLbFillAttr(new SvxFillAttrBox(this)),
- mpToolBoxColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpToolBoxColorBackground.get(), SVX_RES(TB_COLOR))),
- mpTrspTextFT(new FixedText(this, SVX_RES(FL_TRSP_TEXT))),
- mpLBTransType(new ListBox(this, SVX_RES(LB_TRGR_TYPES))),
- mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
- mpBTNGradientBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(mpBTNGradientBackground.get(), SVX_RES(BTN_GRADIENT))),
- mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, TBI_COLOR, mpToolBoxColor.get())),
mpStyleItem(),
mpColorItem(),
mpFillGradientItem(),
@@ -121,28 +112,29 @@ AreaPropertyPanel::AreaPropertyPanel(
mpBindings(pBindings),
mbColorAvail(true)
{
+ get(mpColorTextFT, "filllabel");
+ get(mpTrspTextFT, "transparencylabel");
+ get(mpToolBoxColor, "selectcolor");
+ get(mpLBTransType, "transtype");
+ get(mpMTRTransparent, "settransparency"); // GtkSpinButton
+ get(mpBTNGradient, "selectgradient"); // GtkToolbar
+
+ const sal_uInt16 nIdColor = mpToolBoxColor->GetItemId(UNO_SIDEBARCOLOR);
+ mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, nIdColor, mpToolBoxColor)),
+
Initialize();
- FreeResource();
}
AreaPropertyPanel::~AreaPropertyPanel()
{
- // Destroy the toolboxes, then their background windows.
- mpToolBoxColor.reset();
- mpBTNGradient.reset();
- mpToolBoxColorBackground.reset();
- mpBTNGradientBackground.reset();
}
void AreaPropertyPanel::Initialize()
{
- mpColorTextFT->SetBackground(Wallpaper());
- mpTrspTextFT->SetBackground(Wallpaper());
-
maGradientLinear.SetXOffset(DEFAULT_CENTERX);
maGradientLinear.SetYOffset(DEFAULT_CENTERY);
maGradientLinear.SetAngle(DEFAULT_ANGLE);
@@ -198,21 +190,16 @@ void AreaPropertyPanel::Initialize()
//add for new color picker
mpLbFillAttr->Hide();
- mpToolBoxColor->SetItemImage(TBI_COLOR, maImgColor);
- Size aTbxSize( mpToolBoxColor->CalcWindowSizePixel() );
- mpToolBoxColor->SetOutputSizePixel( aTbxSize );
- mpToolBoxColor->SetItemBits( TBI_COLOR, mpToolBoxColor->GetItemBits( TBI_COLOR ) | TIB_DROPDOWNONLY );
- mpToolBoxColor->SetBackground(Wallpaper());
- mpToolBoxColor->SetPaintTransparent(true);
- mpToolBoxColor->SetQuickHelpText(TBI_COLOR, String(SVX_RES(STR_HELP_COLOR))); //wj acc
- //mpToolBoxColor->SetItemText(TBI_COLOR, msHelpFillAttr);
+ const sal_uInt16 nIdColor = mpToolBoxColor->GetItemId(UNO_SIDEBARCOLOR);
+ mpToolBoxColor->SetItemImage(nIdColor, maImgColor);
+ mpToolBoxColor->SetItemBits( nIdColor, mpToolBoxColor->GetItemBits( nIdColor ) | TIB_DROPDOWNONLY );
+ mpToolBoxColor->SetItemText(nIdColor, msHelpFillAttr);
long aHeightLBStyle = mpLbFillType->GetSizePixel().getHeight();
long aLBPosY = mpLbFillType->GetPosPixel().getY();
long aHeightTBAttr = mpToolBoxColor->GetSizePixel().getHeight();
Point aPointTBAttr = mpToolBoxColor->GetPosPixel();
aPointTBAttr.setY( aLBPosY + aHeightLBStyle / 2 - aHeightTBAttr / 2);
- mpToolBoxColor->SetPosPixel(aPointTBAttr);
aLink = LINK(this, AreaPropertyPanel, ToolBoxColorDropHdl);
mpToolBoxColor->SetDropdownClickHdl ( aLink );
@@ -226,14 +213,12 @@ void AreaPropertyPanel::Initialize()
mpMTRTransparent->SetModifyHdl(LINK(this, AreaPropertyPanel, ModifyTransparentHdl_Impl));
mpMTRTransparent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency"))); //wj acc
- mpBTNGradient->SetItemBits( TBI_BTX_GRADIENT, mpBTNGradient->GetItemBits( TBI_BTX_GRADIENT ) | TIB_DROPDOWNONLY );
+ const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
+ mpBTNGradient->SetItemBits( nIdGradient, mpBTNGradient->GetItemBits( nIdGradient ) | TIB_DROPDOWNONLY );
aLink = LINK( this, AreaPropertyPanel, ClickTrGrHdl_Impl );
mpBTNGradient->SetDropdownClickHdl( aLink );
mpBTNGradient->SetSelectHdl( aLink );
- aTbxSize = mpBTNGradient->CalcWindowSizePixel();
- mpBTNGradient->SetOutputSizePixel( aTbxSize );
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT,maImgLinear);
- mpBTNGradient->SetQuickHelpText(TBI_BTX_GRADIENT, String(SVX_RES(STR_HELP_GRADIENT))); //wj acc
+ mpBTNGradient->SetItemImage(nIdGradient,maImgLinear);
mpBTNGradient->Hide();
long aHeightLBTrans = mpLBTransType->GetSizePixel().getHeight();
@@ -247,15 +232,12 @@ void AreaPropertyPanel::Initialize()
aPointMetric.setY(aPosY+aHeightLBTrans/2-aHeightMetric/2);
aPointTB.setY(aPosY+aHeightLBTrans/2-aHeightTool/2);
aPointTB.setX(aPointTB.getX()+3);
- mpMTRTransparent->SetPosPixel(aPointMetric);
- mpBTNGradient->SetPosPixel(aPointTB);
-
- mpLbFillType->SetAccessibleRelationLabeledBy(mpColorTextFT.get());
+ mpLbFillType->SetAccessibleRelationLabeledBy(mpColorTextFT);
mpLbFillAttr->SetAccessibleRelationLabeledBy(mpLbFillAttr.get());
- mpToolBoxColor->SetAccessibleRelationLabeledBy(mpToolBoxColor.get());
- mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT.get());
- mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent.get());
- mpBTNGradient->SetAccessibleRelationLabeledBy(mpBTNGradient.get());
+ mpToolBoxColor->SetAccessibleRelationLabeledBy(mpToolBoxColor);
+ mpLBTransType->SetAccessibleRelationLabeledBy(mpTrspTextFT);
+ mpMTRTransparent->SetAccessibleRelationLabeledBy(mpMTRTransparent);
+ mpBTNGradient->SetAccessibleRelationLabeledBy(mpBTNGradient);
SetupIcons();
}
@@ -564,9 +546,9 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox )
IMPL_LINK(AreaPropertyPanel, ToolBoxColorDropHdl, ToolBox*, pToolBox)
{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
- if(TBI_COLOR == nId)
+ if(UNO_SIDEBARCOLOR == aCommand)
{
maColorPopup.Show(*pToolBox);
@@ -750,8 +732,9 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
}
}
+ const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
mpLBTransType->SelectEntryPos(nEntryPos);
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, *pImage);
+ mpBTNGradient->SetItemImage(nIdGradient, *pImage);
bZeroValue = false;
}
else
@@ -1269,7 +1252,7 @@ IMPL_LINK( AreaPropertyPanel, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG )
IMPL_LINK( AreaPropertyPanel, ClickTrGrHdl_Impl, ToolBox*, pToolBox )
{
maTrGrPopup.Rearrange(mpFloatTransparenceItem.get());
- OSL_ASSERT(pToolBox->GetCurItemId() == TBI_BTX_GRADIENT);
+ OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT);
maTrGrPopup.Show(*pToolBox);
return (0L);
@@ -1303,25 +1286,26 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG)
{
mpBTNGradient->Show();
+ const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
switch (nSelectType)
{
case 2:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgLinear);
+ mpBTNGradient->SetItemImage(nIdGradient, maImgLinear);
break;
case 3:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgAxial);
+ mpBTNGradient->SetItemImage(nIdGradient, maImgAxial);
break;
case 4:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgRadial);
+ mpBTNGradient->SetItemImage(nIdGradient, maImgRadial);
break;
case 5:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgElli );
+ mpBTNGradient->SetItemImage(nIdGradient, maImgElli );
break;
case 6:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgQuad );
+ mpBTNGradient->SetItemImage(nIdGradient, maImgQuad );
break;
case 7:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, maImgSquare);
+ mpBTNGradient->SetItemImage(nIdGradient, maImgSquare);
break;
}
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc
index a11a54f..5c9def0 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hrc
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc
@@ -16,17 +16,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
// RID_SIDEBAR_AREA_PANEL--------------------------------------------------------------
-#define FT_COLOR_LIST 1
-#define TB_COLOR 2
-#define TBI_COLOR 3
-#define IMG_COLOR 5
-#define VS_COLOR 1
+#include "svx/dialogs.hrc"
#define TBI_LEFT 1
#define TBI_RIGHT 1
#define TBI_BTX_GRADIENT 51
-#define FL_TRSP_TEXT 4
#define LB_TRGR_TYPES 6
#define MTR_TRANSPARENT 7
@@ -50,18 +45,23 @@
#define BTN_LEFT_SECOND 22
#define BTN_RIGHT_FIRST 23
-#define IMG_AXIAL 24
-#define IMG_ELLI 25
-#define IMG_QUAD 26
-#define IMG_RADIAL 27
-#define IMG_SQUARE 28
-#define IMG_LINEAR 29
-#define IMG_ROT_LEFT 30
-#define IMG_ROT_RIGHT 31
-#define STR_HELP_TYPE 32
-#define STR_HELP_ATTR 33
+// global definitions
+#define IMG_AXIAL (RID_SVX_SIDEBAR_BEGIN + 30)
+#define IMG_ELLI (RID_SVX_SIDEBAR_BEGIN + 31)
+#define IMG_QUAD (RID_SVX_SIDEBAR_BEGIN + 32)
+#define IMG_RADIAL (RID_SVX_SIDEBAR_BEGIN + 33)
+#define IMG_SQUARE (RID_SVX_SIDEBAR_BEGIN + 34)
+#define IMG_LINEAR (RID_SVX_SIDEBAR_BEGIN + 35)
+#define IMG_COLOR (RID_SVX_SIDEBAR_BEGIN + 36)
+
+#define IMG_ROT_LEFT (RID_SVX_SIDEBAR_BEGIN + 37)
+#define IMG_ROT_RIGHT (RID_SVX_SIDEBAR_BEGIN + 38)
+
+#define STR_HELP_TYPE (RID_SVX_SIDEBAR_BEGIN + 39)
+#define STR_HELP_ATTR (RID_SVX_SIDEBAR_BEGIN + 40)
+#define VS_COLOR (RID_SVX_SIDEBAR_BEGIN + 41)
+
#define STR_HELP_COLOR 41
-#define STR_HELP_GRADIENT 42
#define FIXED_TEXT_HEIGHT 9
#define FIXED_TEXT_WIDTH 40
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index caf005a..d0df11a 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -31,6 +31,7 @@
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/drawitem.hxx>
+#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
@@ -50,7 +51,7 @@ class PopupContainer;
class AreaTransparencyGradientControl;
class AreaPropertyPanel
-: public Control,
+: public PanelLayout,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
@@ -98,16 +99,14 @@ private:
XGradient maGradientRect;
//ui controls
- ::boost::scoped_ptr< FixedText > mpColorTextFT;
- ::boost::scoped_ptr< SvxFillTypeBox > mpLbFillType;
- ::boost::scoped_ptr< SvxFillAttrBox > mpLbFillAttr;
- ::boost::scoped_ptr< Window > mpToolBoxColorBackground;
- ::boost::scoped_ptr< ToolBox > mpToolBoxColor; // for new color picker
- ::boost::scoped_ptr< FixedText > mpTrspTextFT;
- ::boost::scoped_ptr< ListBox > mpLBTransType;
- ::boost::scoped_ptr< MetricField > mpMTRTransparent;
- ::boost::scoped_ptr< Window > mpBTNGradientBackground;
- ::boost::scoped_ptr< ToolBox > mpBTNGradient;
+ FixedText* mpColorTextFT;
+ ::boost::scoped_ptr< SvxFillTypeBox > mpLbFillType;
+ ::boost::scoped_ptr< SvxFillAttrBox > mpLbFillAttr;
+ ToolBox* mpToolBoxColor; // for new color picker
+ FixedText* mpTrspTextFT;
+ ListBox* mpLBTransType;
+ MetricField* mpMTRTransparent;
+ ToolBox* mpBTNGradient;
::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src
index 849c141..353e125 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -23,6 +23,43 @@
#define TOOLBOX_WIDTH 50
#define TOOLBOX_HEIGHT 17
+Image IMG_AXIAL
+{
+ ImageBitmap = Bitmap{File = "symphony/axial.png";};
+};
+Image IMG_ELLI
+{
+ ImageBitmap = Bitmap{File = "symphony/ellipsoid.png";};
+};
+Image IMG_QUAD
+{
+ ImageBitmap = Bitmap{File = "symphony/Quadratic.png";};
+};
+Image IMG_RADIAL
+{
+ ImageBitmap = Bitmap{File = "symphony/radial.png";};
+};
+Image IMG_SQUARE
+{
+ ImageBitmap = Bitmap{File = "symphony/Square.png";};
+};
+Image IMG_LINEAR
+{
+ ImageBitmap = Bitmap{File = "symphony/linear.png";};
+};
+Image IMG_COLOR
+{
+ ImageBitmap = Bitmap{File = "symphony/fill_color.png";};
+};
+Image IMG_ROT_LEFT
+{
+ ImageBitmap = Bitmap{File = "symphony/rotate_left.png";};
+};
+Image IMG_ROT_RIGHT
+{
+ ImageBitmap = Bitmap{File = "symphony/rotate_right.png";};
+};
+
Control RID_SIDEBAR_AREA_PANEL
{
OutputSize = TRUE;
@@ -31,147 +68,6 @@ Control RID_SIDEBAR_AREA_PANEL
Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + SECTIONPAGE_MARGIN_VERTICAL_BOT + 2*( FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT) + CONTROL_SPACING_VERTICAL );
HelpID = HID_PROPERTYPANEL_AREA_SECTION ;
Text [ en-US ] = "Area";
-
- FixedText FT_COLOR_LIST
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP ) ;
- Size = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Fill:";
- };
- FixedText FL_TRSP_TEXT
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
- Size = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
- Text [ en-US ] = "~Transparency:";
- };
- ToolBox TB_COLOR
- {
- HelpID = HID_PPROPERTYPANEL_AREA_TBX_COLOR;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + 1) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
- TabStop = TRUE ;
- Text = "Color";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_COLOR ;
- HelpID = HID_PPROPERTYPANEL_AREA_TBI_COLOR;
- DropDown = TRUE ;
- Text = "Color" ;
- };
- };
- };
- String STR_HELP_COLOR
- {
- Text [ en-US ] = "Select the color to apply." ;
- };
- String STR_HELP_TYPE
- {
- Text [en-US] = "Select the fill type to apply.";
- };
- String STR_HELP_ATTR
- {
- Text [en-US] = "Select the effect to apply.";
- };
- Image IMG_AXIAL
- {
- ImageBitmap = Bitmap{File = "symphony/axial.png";};
- };
- Image IMG_ELLI
- {
- ImageBitmap = Bitmap{File = "symphony/ellipsoid.png";};
- };
- Image IMG_QUAD
- {
- ImageBitmap = Bitmap{File = "symphony/Quadratic.png";};
- };
- Image IMG_RADIAL
- {
- ImageBitmap = Bitmap{File = "symphony/radial.png";};
- };
- Image IMG_SQUARE
- {
- ImageBitmap = Bitmap{File = "symphony/Square.png";};
- };
- Image IMG_LINEAR
- {
- ImageBitmap = Bitmap{File = "symphony/linear.png";};
- };
- Image IMG_COLOR
- {
- ImageBitmap = Bitmap{File = "symphony/fill_color.png";};
- };
-
- //=====================================================================================================================================
- ListBox LB_TRGR_TYPES
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
- Size = MAP_APPFONT ( MBOX_WIDTH , LISTBOX_HEIGHT ) ;
- QuickHelpText [ en-US ] = "Select the type of transparency to apply." ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- HelpID = HID_PPROPERTYPANEL_AREA_LB_TRGR_TYPES ;
- StringList [ en-US ] =
- {
- < "None" ; Default ; > ;
- < "Solid" ; Default ; > ;
- < "Linear" ; Default ; > ;
- < "Axial" ; Default ; > ;
- < "Radial" ; Default ; > ;
- < "Ellipsoid" ; Default ; > ;
- < "Quadratic" ; Default ; > ;
- < "Square" ; Default ; > ;
- };
- };
-
- MetricField MTR_TRANSPARENT
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
- Size = MAP_APPFONT ( MBOX_WIDTH + 1 ,MBOX_HEIGHT ) ;
- HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRANSPARENT ;
- QuickHelpText [ en-US ] = "Specify 0% for fully opaque through 100% for fully transparent." ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- Last = 100 ;
- SpinSize = 5 ;
- };
-
- ToolBox BTN_GRADIENT
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
- HelpID = HID_PPROPERTYPANEL_AREA_TBX_GRADIENT ;
- SVLook = TRUE ;
- Border = FALSE ;
- TabStop = TRUE ;
- Text = "Gradient";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_BTX_GRADIENT ;
- HelpID = HID_PPROPERTYPANEL_AREA_TBI_GRADIENT ;
- ItemBitmap = Bitmap
- {
- File = "symphony/linear.png" ;
- };
- DropDown = TRUE;
- Text = "Gradient" ;
- };
- };
- };
- String STR_HELP_GRADIENT
- {
- Text [ en-US ] = "Specify the variation of gradient transparency." ;
- };
};
Control RID_POPUPPANEL_AREAPAGE_TRGR
@@ -359,14 +255,6 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
{
Text [ en-US ] = "Rotate clockwise by 45 degrees." ;
};
- Image IMG_ROT_LEFT
- {
- ImageBitmap = Bitmap{File = "symphony/rotate_left.png";};
- };
- Image IMG_ROT_RIGHT
- {
- ImageBitmap = Bitmap{File = "symphony/rotate_right.png";};
- };
};
Control RID_POPUPPANEL_AERAPAGE_COLOR
{
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
new file mode 100644
index 0000000..fe5c29b
--- /dev/null
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkGrid" id="AreaPropertyPanel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="filllabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Fill:</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Fill:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">4</property>
+ <child>
+ <object class="GtkComboBoxText" id="fillstyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the fill type to apply.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="selectcolor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuToolButton" id="color">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the color to apply.</property>
+ <property name="halign">end</property>
+ <property name="action_name">.uno:sidebarcolor</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="transparencylabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Transparency</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Transparency:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBoxText" id="transtype">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Select the type of transparence to apply.</property>
+ <property name="tooltip_text" translatable="yes">Select the type of transparence to apply.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">None</item>
+ <item translatable="yes">Solid</item>
+ <item translatable="yes">Linear</item>
+ <item translatable="yes">Axial</item>
+ <item translatable="yes">Radial</item>
+ <item translatable="yes">Ellipsoid</item>
+ <item translatable="yes">Quadratic</item>
+ <item translatable="yes">Square</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkSpinButton" id="settransparency:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+ <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
+ <property name="halign">end</property>
+ <property name="max_length">100</property>
+ <property name="invisible_char">•</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="climb_rate">5</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="selectgradient">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_left">13</property>
+ <child>
+ <object class="GtkMenuToolButton" id="gradient">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the variation of gradient transparency.</property>
+ <property name="tooltip_text" translatable="yes">Specify the variation of gradient transparency.</property>
+ <property name="margin_left">23</property>
+ <property name="action_name">.uno:sidebargradient</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
commit 24a98e226aba0ffbfc34a2dd35cb97e1503f684b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jul 12 16:49:53 2013 +0200
sidebar: Mnemonic widgets + adjustment in LinePropertyPanel.
Change-Id: I4a65e33fde6228405b440ca9653272aa44ea1d6e
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index fccd8a7..289012b 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">5</property>
+ <property name="page_increment">20</property>
+ </object>
<object class="GtkGrid" id="LinePropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -76,6 +81,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Color:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">color</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -94,6 +100,7 @@
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
<property name="climb_rate">5</property>
</object>
<packing>
@@ -142,6 +149,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Transparency:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">linetransparency:0%</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -194,6 +202,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Arrow:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">beginarrowstyle</property>
</object>
<packing>
<property name="expand">False</property>
@@ -249,6 +258,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Corner style:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">edgestyle</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -293,6 +303,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Ca_p style:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">linecapstyle</property>
</object>
<packing>
<property name="left_attach">1</property>
commit c8140e71732a4e336b590aaf377de7525f775efd
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jul 12 16:20:41 2013 +0200
sidebar: More logical LinePropertyPanel layout.
Change-Id: I46a2226566163331e8ba03aeb159e1f7e206e023
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 63a8905..fccd8a7 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -22,9 +22,9 @@
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
- <property name="column_homogeneous">True</property>
<child>
<object class="GtkLabel" id="widthlabel">
<property name="visible">True</property>
@@ -85,6 +85,25 @@
</packing>
</child>
<child>
+ <object class="GtkSpinButton" id="linetransparency:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
+ <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="climb_rate">5</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolbar" id="color">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -110,8 +129,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -125,25 +144,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="linetransparency:0%">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
- <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- <property name="climb_rate">5</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
commit 378510aeba5635cff40ef446722e4d2b7bbeb98f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jul 15 15:59:45 2013 +0200
Fix build.
Change-Id: Ia08b6e87b5be3ca2994e0c5fbc6b91c1a800208e
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index c9e663e..70babe9 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -31,7 +31,9 @@
//==================================================================================
//= various typedefs
//==================================================================================
+namespace {
DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray);
+}
//==================================================================================
//= OSubComponent - a component which holds a hard ref to it's parent
diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx
index be605e2..773ba52 100644
--- a/include/connectivity/internalnode.hxx
+++ b/include/connectivity/internalnode.hxx
@@ -29,7 +29,7 @@ namespace connectivity
//==========================================================================
/** special node for avoiding memory leaks
*/
- class OSQLInternalNode : public OSQLParseNode
+ class OOO_DLLPUBLIC_DBTOOLS OSQLInternalNode : public OSQLParseNode
{
public:
OSQLInternalNode(const sal_Char* pNewValue,
commit 3f48ec8e73a5cb2cdffaf5edf0eb1e8c44cbc20f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 15 13:58:50 2013 +0100
HIG spacing and indents
Change-Id: I97888b8659bb978595157e881c18ce51c1482b46
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 420aa33..34446a9 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -535,14 +535,14 @@ private:
};
SteppedPropertiesDialog::SteppedPropertiesDialog( Window* pParent )
- : ModalDialog( pParent, "SteppedLinesDialog", "modules/schart/ui/steppedlinesdlg.ui")
+ : ModalDialog( pParent, "SteppedLinesDialog", "modules/schart/ui/steppedlinesdlg.ui")
{
get(m_pRB_Start, "step_start_rb");
get(m_pRB_End, "step_end_rb");
get(m_pRB_CenterX, "step_center_x_rb");
get(m_pRB_CenterY, "step_center_y_rb");
- this->SetText( String( SchResId( STR_DLG_STEPPED_LINE_PROPERTIES ) ) );
+ SetText(SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES));
}
SteppedPropertiesDialog::~SteppedPropertiesDialog()
diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui
index 65464d7..9b1b34c 100644
--- a/chart2/uiconfig/ui/smoothlinesdlg.ui
+++ b/chart2/uiconfig/ui/smoothlinesdlg.ui
@@ -40,6 +40,7 @@
<object class="GtkLabel" id="TypeLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Line _Type:</property>
<property name="use_underline">True</property>
</object>
diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui
index ff1b5c0..2afedbe 100644
--- a/chart2/uiconfig/ui/steppedlinesdlg.ui
+++ b/chart2/uiconfig/ui/steppedlinesdlg.ui
@@ -4,177 +4,13 @@
<!-- interface-local-resource-path /home/eric/Documents/computers/libreoffice/core/icon-themes/galaxy/chart2 -->
<object class="GtkDialog" id="SteppedLinesDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Choose the type of stepping:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkImage" id="step_center_x_img">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">chart2/res/step_center_x_30.png</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="step_end_img">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">chart2/res/step_end_30.png</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="step_center_y_img">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">chart2/res/step_center_y_30.png</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="step_start_rb">
- <property name="label" translatable="yes">_Start with horizontal line</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">step_center_x_rb</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="step_center_x_rb">
- <property name="label" translatable="yes">Step at the _horizontal mean</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list