summaryrefslogtreecommitdiff
path: root/svx/source/xoutdev/xtabgrdt.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
commit091e4aee3386f3bfee081dc8646494e0eb97f88a (patch)
treedd79298b4e8729ca7dc874274d4a33ea88fe107d /svx/source/xoutdev/xtabgrdt.cxx
parentf0681adbf092e2b455db52535f2df882bc87343a (diff)
parent224bd63b3fa459baa0a6bb5cd03f5dc2ca475d82 (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: avmedia/source/framework/mediacontrol.cxx connectivity/source/commontools/DateConversion.cxx desktop/source/deployment/registry/component/dp_component.cxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/txtrange.hxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editview.cxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/misc/txtrange.cxx editeng/source/outliner/outlin2.cxx editeng/source/outliner/outlvw.cxx framework/source/layoutmanager/layoutmanager.cxx linguistic/source/lngsvcmgr.hxx sfx2/source/appl/app.cxx sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appdde.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/workwin.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macro.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/statcach.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styledlg.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplcitem.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/new.cxx sfx2/source/doc/objcont.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/objxtor.cxx sfx2/source/inc/appdata.hxx sfx2/source/inc/helpid.hrc sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/statcach.hxx sfx2/source/inc/templdgi.hxx sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnumgr.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/statbar/stbitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/frame2.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/sfxbasecontroller.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewfrm2.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx svx/inc/svx/svditer.hxx svx/source/dialog/sdstring.src svx/source/form/fmpage.cxx svx/source/form/formcontroller.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svditer.cxx svx/source/svdraw/svdview.cxx xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'svx/source/xoutdev/xtabgrdt.cxx')
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabgrdt.cxx46
1 files changed, 23 insertions, 23 deletions
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 2f413b5030f9..87709fd57399 100644..100755
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
#include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
#include <unotools/ucbstreamhelper.hxx>
#include "xmlxtexp.hxx"
@@ -81,7 +81,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XGradientTable::XGradientTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -116,35 +116,35 @@ XGradientEntry* XGradientTable::GetGradient(long nIndex) const
/************************************************************************/
-BOOL XGradientTable::Load()
+sal_Bool XGradientTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Save()
+sal_Bool XGradientTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Create()
+sal_Bool XGradientTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::CreateBitmapsForUI()
+sal_Bool XGradientTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -253,18 +253,18 @@ XGradientEntry* XGradientList::GetGradient(long nIndex) const
return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) );
}
-BOOL XGradientList::Load()
+sal_Bool XGradientList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -276,17 +276,17 @@ BOOL XGradientList::Load()
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XGradientList::Save()
+sal_Bool XGradientList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -298,7 +298,7 @@ BOOL XGradientList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XGradientList::Create()
+sal_Bool XGradientList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
xub_StrLen nLen;
@@ -317,16 +317,16 @@ BOOL XGradientList::Create()
aStr.SetChar(nLen, sal_Unicode('6'));
Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT , 1900,60,60,50,100,100),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XGradientList::CreateBitmapsForUI()
+sal_Bool XGradientList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -335,10 +335,10 @@ BOOL XGradientList::CreateBitmapsForUI()
impDestroy();
- return( FALSE );
+ return( sal_False );
}
-Bitmap* XGradientList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();