[Libreoffice-commits] .: dbaccess/source reportdesign/inc reportdesign/source
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Wed Nov 10 01:03:29 PST 2010
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 20 +------
dbaccess/source/ui/app/AppDetailView.cxx | 68 +++++++++++++------------
dbaccess/source/ui/browser/unodatbr.cxx | 14 ++---
dbaccess/source/ui/control/tabletree.cxx | 14 +----
dbaccess/source/ui/dlg/adtabdlg.cxx | 21 +++----
reportdesign/inc/RptResId.hrc | 3 -
reportdesign/source/ui/dlg/Navigator.cxx | 58 ++++++++-------------
reportdesign/source/ui/dlg/Navigator.src | 13 +---
8 files changed, 87 insertions(+), 124 deletions(-)
New commits:
commit ab97c09b7e8ac06d3c42f5617f6169fbee186249
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Nov 9 21:00:04 2010 -0800
Bitmap Tree Cleanup - base
Removed all references to HIGHCONTRAST mode from svtools classes:
SvImpLBox
SvTreeListBox
The reset is just fall out.
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 12f75c8..845c1c7 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -782,12 +782,8 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
pEntry = pList->InsertEntry( *pIter, _pParent );
Image aImage = Image( ModuleRes( _nImageId ) );
- pList->SetExpandedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
- pList->SetCollapsedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
-
- Image aHCImage = Image( ModuleRes( _nHighContrastImageId ) );
- pList->SetExpandedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
- pList->SetCollapsedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
+ pList->SetExpandedEntryBmp( pEntry, aImage );
+ pList->SetCollapsedEntryBmp( pEntry, aImage );
}
}
}
@@ -811,9 +807,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
_pTreeView->SetSelectionMode(MULTIPLE_SELECTION);
_pTreeView->SetDefaultCollapsedEntryBmp( _rImage );
- _pTreeView->SetDefaultCollapsedEntryBmp( _rImageHC, BMP_COLOR_HIGHCONTRAST );
_pTreeView->SetDefaultExpandedEntryBmp( _rImage );
- _pTreeView->SetDefaultExpandedEntryBmp( _rImageHC, BMP_COLOR_HIGHCONTRAST );
_pTreeView->SetDoubleClickHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick));
_pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick));
@@ -919,12 +913,8 @@ SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::
pRet = pTreeView->InsertEntry( _rName, pEntry );
Image aImage = Image( ModuleRes( nImageId ) );
- pTreeView->SetExpandedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
- pTreeView->SetCollapsedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
-
- Image aHCImage = Image( ModuleRes( nImageIdH ) );
- pTreeView->SetExpandedEntryBmp( pRet, aHCImage, BMP_COLOR_HIGHCONTRAST );
- pTreeView->SetCollapsedEntryBmp( pRet, aHCImage, BMP_COLOR_HIGHCONTRAST );
+ pTreeView->SetExpandedEntryBmp( pRet, aImage );
+ pTreeView->SetCollapsedEntryBmp( pRet, aImage );
}
}
return pRet;
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 60b26dc..b532b64 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -360,7 +360,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
,m_aFL(this,WB_VERT)
,m_pDetailView(_pDetailView)
{
- DBG_CTOR(OTasksWindow,NULL);
+ DBG_CTOR(OTasksWindow,NULL);
SetUniqueId(UID_APP_TASKS_WINDOW);
m_aCreation.SetHelpId(HID_APP_CREATION_LIST);
m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl));
@@ -372,7 +372,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
// -----------------------------------------------------------------------------
OTasksWindow::~OTasksWindow()
{
- DBG_DTOR(OTasksWindow,NULL);
+ DBG_DTOR(OTasksWindow,NULL);
Clear();
}
// -----------------------------------------------------------------------
@@ -467,7 +467,7 @@ void OTasksWindow::Resize()
Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT );
sal_Int32 n6PPT = aFLSize.Height();
long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5);
-
+
m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) );
// i77897 make the m_aHelpText a little bit smaller. (-5)
sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5;
@@ -477,20 +477,27 @@ void OTasksWindow::Resize()
m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) );
Size aDesc = m_aDescription.CalcMinimumSize();
m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) );
-
+
m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0), Size(aFLSize.Width(), nOutputHeight ) );
}
// -----------------------------------------------------------------------------
void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
-{
+{
DBG_CHKTHIS(OTasksWindow,NULL);
Clear();
-
+
try
{
- Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin().getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY);
- Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")));
- Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY);
+ Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier(
+ getDetailView()->getBorderWin().getView()->getORB()->createInstance(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) )
+ ) ,
+ UNO_QUERY
+ );
+ Reference< XUIConfigurationManager > xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OfficeDatabaseDocument" ) )
+ );
+ Reference< XImageManager > xImageMgr( xUIConfigMgr->getImageManager(), UNO_QUERY );
// copy the commands so we can use them with the config managers
Sequence< ::rtl::OUString > aCommands( _rList.size() );
@@ -499,31 +506,28 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
for ( TaskEntryList::const_iterator pCopyTask = _rList.begin(); pCopyTask != aEnd; ++pCopyTask, ++pCommands )
*pCommands = pCopyTask->sUNOCommand;
- Sequence< Reference< XGraphic> > aImages = xImageMgr->getImages( ImageType::SIZE_DEFAULT | ImageType::COLOR_NORMAL, aCommands );
- Sequence< Reference< XGraphic> > aHCImages = xImageMgr->getImages( ImageType::SIZE_DEFAULT | ImageType::COLOR_HIGHCONTRAST, aCommands );
+ Sequence< Reference< XGraphic> > aImages = xImageMgr->getImages(
+ ImageType::SIZE_DEFAULT | ImageType::COLOR_NORMAL ,
+ aCommands
+ );
const Reference< XGraphic >* pImages( aImages.getConstArray() );
- const Reference< XGraphic >* pHCImages( aHCImages.getConstArray() );
- for ( TaskEntryList::const_iterator pTask = _rList.begin(); pTask != aEnd; ++pTask, ++pImages, ++pHCImages )
+ for ( TaskEntryList::const_iterator pTask = _rList.begin(); pTask != aEnd; ++pTask, ++pImages )
{
SvLBoxEntry* pEntry = m_aCreation.InsertEntry( pTask->sTitle );
pEntry->SetUserData( reinterpret_cast< void* >( new TaskEntry( *pTask ) ) );
Image aImage = Image( *pImages );
- m_aCreation.SetExpandedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
- m_aCreation.SetCollapsedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
-
- Image aHCImage = Image( *pHCImages );
- m_aCreation.SetExpandedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
- m_aCreation.SetCollapsedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
+ m_aCreation.SetExpandedEntryBmp( pEntry, aImage );
+ m_aCreation.SetCollapsedEntryBmp( pEntry, aImage );
}
}
catch(Exception&)
{
}
- m_aCreation.Show();
+ m_aCreation.Show();
m_aCreation.SelectAll(FALSE);
m_aHelpText.Show();
m_aDescription.Show();
@@ -542,7 +546,7 @@ void OTasksWindow::Clear()
delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() );
pEntry = m_aCreation.Next(pEntry);
}
- m_aCreation.Clear();
+ m_aCreation.Clear();
}
//==================================================================
// class OApplicationDetailView
@@ -554,7 +558,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
,m_aContainer(this,0,WB_BORDER | WB_DIALOGCONTROL )
,m_rBorderWin(_rParent)
{
- DBG_CTOR(OApplicationDetailView,NULL);
+ DBG_CTOR(OApplicationDetailView,NULL);
SetUniqueId(UID_APP_DETAIL_VIEW);
ImplInitSettings( sal_True, sal_True, sal_True );
@@ -878,23 +882,23 @@ SvLBoxEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const
return m_pControlHelper->getEntry(_aPoint);
}
// -----------------------------------------------------------------------------
-sal_Bool OApplicationDetailView::isCutAllowed()
-{
+sal_Bool OApplicationDetailView::isCutAllowed()
+{
DBG_CHKTHIS(OApplicationDetailView,NULL);
- return m_pControlHelper->isCutAllowed();
+ return m_pControlHelper->isCutAllowed();
}
-sal_Bool OApplicationDetailView::isCopyAllowed()
-{
+sal_Bool OApplicationDetailView::isCopyAllowed()
+{
DBG_CHKTHIS(OApplicationDetailView,NULL);
- return m_pControlHelper->isCopyAllowed();
+ return m_pControlHelper->isCopyAllowed();
}
sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); }
void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); }
void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); }
-void OApplicationDetailView::paste()
-{
+void OApplicationDetailView::paste()
+{
DBG_CHKTHIS(OApplicationDetailView,NULL);
- m_pControlHelper->paste();
+ m_pControlHelper->paste();
}
// -----------------------------------------------------------------------------
SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject )
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 6f7d728..5436893 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -688,7 +688,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
aDescription >>= sTemp;
if ( !sTemp.getLength() )
xColumn->getPropertyValue( PROPERTY_DESCRIPTION ) >>= sTemp;
-
+
aDescription <<= sTemp;
aInitialValues.push_back( NamedValue( PROPERTY_HELPTEXT, aDescription ) );
@@ -2082,10 +2082,8 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const
SvLBoxEntry* pNewEntry = m_pTreeView->getListBox().InsertEntry( _rName, _pParent, _eEntryType == etQueryContainer , LIST_APPEND, _pUserData );
- m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
- m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
- m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
- m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
+ m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImage );
+ m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage );
return pNewEntry;
}
@@ -2236,7 +2234,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry )
{
DBG_UNHANDLED_EXCEPTION();
}
-
+
bSuccess = pEntryData->xContainer.is();
}
else
@@ -2469,7 +2467,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
sal_Int32 nOldType = 0;
xRowSetProps->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nOldType;
Reference<XConnection> xOldConnection(xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY);
-
+
// the name of the table or query
SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING);
OSL_ENSURE(pString,"There must be a string item!");
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index fa59333..9af5da4 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -105,10 +105,8 @@ OTableTreeListBox::~OTableTreeListBox()
void OTableTreeListBox::implSetDefaultImages()
{
ImageProvider aImageProvider;
- SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ), BMP_COLOR_NORMAL );
- SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, true ), BMP_COLOR_HIGHCONTRAST );
- SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ), BMP_COLOR_NORMAL );
- SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, true ), BMP_COLOR_HIGHCONTRAST );
+ SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ) );
+ SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ) );
}
// -----------------------------------------------------------------------------
@@ -510,10 +508,8 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry(
Image aImage, aImageHC;
m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage, aImageHC );
- SetExpandedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
- SetCollapsedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
- SetExpandedEntryBmp( pRet, aImageHC, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pRet, aImageHC, BMP_COLOR_HIGHCONTRAST );
+ SetExpandedEntryBmp( pRet, aImage );
+ SetCollapsedEntryBmp( pRet, aImage );
}
return pRet;
}
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 49bc28b..114a52a 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -81,7 +81,7 @@ class TableListFacade : public ::cppu::BaseMutex
{
OTableTreeListBox& m_rTableList;
Reference< XConnection > m_xConnection;
- ::rtl::Reference< comphelper::OContainerListenerAdapter>
+ ::rtl::Reference< comphelper::OContainerListenerAdapter>
m_pContainerListener;
bool m_bAllowViews;
@@ -94,7 +94,7 @@ public:
{
}
virtual ~TableListFacade();
-
+
private:
virtual void updateTableObjectList( bool _bAllowViews );
@@ -133,8 +133,8 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const
try
{
Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW );
- if ( !aCatalog.getLength()
- && aSchema.getLength()
+ if ( !aCatalog.getLength()
+ && aSchema.getLength()
&& xMeta->supportsCatalogsInDataManipulation()
&& !xMeta->supportsSchemasInDataManipulation() )
{
@@ -175,7 +175,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
try
{
Reference< XTablesSupplier > xTableSupp( m_xConnection, UNO_QUERY_THROW );
-
+
Reference< XViewsSupplier > xViewSupp;
Reference< XNameAccess > xTables, xViews;
Sequence< ::rtl::OUString > sTables, sViews;
@@ -249,7 +249,7 @@ class QueryListFacade : public ::cppu::BaseMutex
{
SvTreeListBox& m_rQueryList;
Reference< XConnection > m_xConnection;
- ::rtl::Reference< comphelper::OContainerListenerAdapter>
+ ::rtl::Reference< comphelper::OContainerListenerAdapter>
m_pContainerListener;
public:
@@ -299,12 +299,9 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
{
ImageProvider aImageProvider( m_xConnection );
Image aQueryImage( aImageProvider.getDefaultImage( DatabaseObject::QUERY, false ) );
- Image aQueryImageHC( aImageProvider.getDefaultImage( DatabaseObject::QUERY, true ) );
- m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage, BMP_COLOR_NORMAL );
- m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage, BMP_COLOR_NORMAL );
- m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImageHC, BMP_COLOR_HIGHCONTRAST );
- m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImageHC, BMP_COLOR_HIGHCONTRAST );
+ m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage );
+ m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage );
Reference< XQueriesSupplier > xSuppQueries( m_xConnection, UNO_QUERY_THROW );
Reference< XNameAccess > xQueries( xSuppQueries->getQueries(), UNO_QUERY_THROW );
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 1fecb75..a848a5d 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -266,7 +266,6 @@
#define IMG_CONDFORMAT_DLG_LC (RID_IMAGELIST_START + 2)
#define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3)
#define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4)
-#define RID_SVXIMGLIST_RPTEXPL_HC (RID_IMAGELIST_START + 5)
#define IMGLST_GROUPSORT_DLG_SC (RID_IMAGELIST_START + 6)
#define IMGLST_GROUPSORT_DLG_SCH (RID_IMAGELIST_START + 7)
#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 8)
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index f12a225..24c4432 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -154,7 +154,6 @@ class NavigatorTree : public ::cppu::BaseMutex
AutoTimer m_aDropActionTimer;
Timer m_aSynchronizeTimer;
ImageList m_aNavigatorImages;
- ImageList m_aNavigatorImagesHC;
Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde
DROP_ACTION m_aDropActionType;
OReportController& m_rController;
@@ -205,7 +204,7 @@ public:
virtual void traverseReportFooter(const uno::Reference< report::XSection>& _xSection);
virtual void traversePageHeader(const uno::Reference< report::XSection>& _xSection);
virtual void traversePageFooter(const uno::Reference< report::XSection>& _xSection);
-
+
virtual void traverseGroups(const uno::Reference< report::XGroups>& _xGroups);
virtual void traverseGroup(const uno::Reference< report::XGroup>& _xGroup);
virtual void traverseGroupFunctions(const uno::Reference< report::XFunctions>& _xFunctions);
@@ -232,7 +231,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
,m_pDragedEntry(NULL)
,m_nTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS )
{
- DBG_CTOR(rpt_NavigatorTree,NULL);
+ DBG_CTOR(rpt_NavigatorTree,NULL);
m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition().get());
m_pReportListener->addProperty(PROPERTY_PAGEHEADERON);
m_pReportListener->addProperty(PROPERTY_PAGEFOOTERON);
@@ -244,17 +243,10 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
SetHelpId( HID_REPORT_NAVIGATOR_TREE );
m_aNavigatorImages = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL ) );
- m_aNavigatorImagesHC = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL_HC ) );
SetNodeBitmaps(
m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_NORMAL
- );
- SetNodeBitmaps(
- m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_HIGHCONTRAST
+ m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
);
SetDragDropMode(0xFFFF);
@@ -277,7 +269,7 @@ NavigatorTree::~NavigatorTree()
}
m_pReportListener->dispose();
m_pSelectionListener->dispose();
- DBG_DTOR(rpt_NavigatorTree,NULL);
+ DBG_DTOR(rpt_NavigatorTree,NULL);
}
//------------------------------------------------------------------------------
void NavigatorTree::Command( const CommandEvent& rEvt )
@@ -317,14 +309,14 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
sal_Bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() ||
uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is());
PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) );
-
+
USHORT nCount = aContextMenu.GetItemCount();
for (USHORT i = 0; i < nCount; ++i)
{
if ( MENUITEM_SEPARATOR != aContextMenu.GetItemType(i))
{
USHORT nId = aContextMenu.GetItemId(i);
-
+
aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId));
sal_Bool bEnabled = m_rController.isCommandEnabled(nId);
if ( nId == SID_RPT_NEW_FUNCTION )
@@ -372,7 +364,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
{
if (m_aDropActionTimer.IsActive())
m_aDropActionTimer.Stop();
- }
+ }
else
{
bool bNeedTrigger = false;
@@ -381,14 +373,14 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
{
m_aDropActionType = DA_SCROLLUP;
bNeedTrigger = true;
- }
+ }
else if ((aDropPos.Y() < GetSizePixel().Height()) && (aDropPos.Y() >= GetSizePixel().Height() - GetEntryHeight()))
{
m_aDropActionType = DA_SCROLLDOWN;
bNeedTrigger = true;
- }
+ }
else
- {
+ {
SvLBoxEntry* pDropppedOn = GetEntry(aDropPos);
if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn))
{
@@ -409,7 +401,7 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
m_aDropActionTimer.SetTimeout(DROP_ACTION_TIMER_TICK_BASE);
m_aDropActionTimer.Start();
}
- }
+ }
else if (!bNeedTrigger)
m_aDropActionTimer.Stop();
}
@@ -479,8 +471,8 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/)
aSelection <<= static_cast<UserData*>(pEntry->GetUserData())->getContent();
m_rController.select(aSelection);
m_pSelectionListener->unlock();
- }
-
+ }
+
return 0L;
}
// -----------------------------------------------------------------------------
@@ -527,12 +519,6 @@ SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntr
{
const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) );
pEntry = InsertEntry(_sName,aImage,aImage,_pParent,FALSE,_nPosition,_pData);
- if ( pEntry )
- {
- const Image aImageHC( m_aNavigatorImagesHC.GetImage( _nImageId ) );
- SetExpandedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
- }
}
else
pEntry = InsertEntry(_sName,_pParent,FALSE,_nPosition,_pData);
@@ -698,7 +684,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
}
}
// -----------------------------------------------------------------------------
-void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent )
+void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent )
{
SvLBoxEntry* pEntry = find(_rEvent.Source);
uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW);
@@ -779,13 +765,13 @@ void NavigatorTree::removeEntry(SvLBoxEntry* _pEntry,bool _bRemove)
}
DBG_NAME(rpt_NavigatorTree_UserData)
// -----------------------------------------------------------------------------
-NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent)
+NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent)
: OPropertyChangeListener(m_aMutex)
, OContainerListener(m_aMutex)
, m_xContent(_xContent)
, m_pTree(_pTree)
{
- DBG_CTOR(rpt_NavigatorTree_UserData,NULL);
+ DBG_CTOR(rpt_NavigatorTree_UserData,NULL);
uno::Reference<beans::XPropertySet> xProp(m_xContent,uno::UNO_QUERY);
if ( xProp.is() )
{
@@ -816,7 +802,7 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno
// -----------------------------------------------------------------------------
NavigatorTree::UserData::~UserData()
{
- DBG_DTOR(rpt_NavigatorTree_UserData,NULL);
+ DBG_DTOR(rpt_NavigatorTree_UserData,NULL);
if ( m_pContainerListener.is() )
m_pContainerListener->dispose();
if ( m_pListener.is() )
@@ -843,7 +829,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent&
pMemFunSection = ::std::mem_fun(&OGroupHelper::getFooter);
nPos = m_pTree->GetChildCount(pEntry) - 1;
}
-
+
OGroupHelper aGroupHelper(xGroup);
if ( pIsOn(&aGroupHelper) )
{
@@ -903,7 +889,7 @@ public:
::std::auto_ptr<NavigatorTree> m_pNavigatorTree;
};
-ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent)
+ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent)
:m_xReport(_rController.getReportDefinition())
,m_rController(_rController)
,m_pNavigatorTree(new NavigatorTree(_pParent,_rController))
@@ -939,14 +925,14 @@ ONavigator::ONavigator( Window* _pParent
m_pImpl->m_pNavigatorTree->GrabFocus();
SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
Show();
-
+
}
// -----------------------------------------------------------------------------
//------------------------------------------------------------------------
ONavigator::~ONavigator()
{
- DBG_DTOR( rpt_ONavigator,NULL);
+ DBG_DTOR( rpt_ONavigator,NULL);
}
//------------------------------------------------------------------------------
void ONavigator::Resize()
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index 5cac973..a97f6f1 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -49,7 +49,7 @@ FloatingWindow RID_NAVIGATOR
Moveable = TRUE ;
Closeable = TRUE ;
Sizeable = TRUE;
-
+
Control 1
{
Pos = MAP_APPFONT( 0, 0 );
@@ -88,13 +88,6 @@ ImageList RID_SVXIMGLIST_RPTEXPL
NAVIGATOR_IMAGEIDS;
};
-ImageList RID_SVXIMGLIST_RPTEXPL_HC
-{
- Prefix = "sxh";
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
- NAVIGATOR_IMAGEIDS;
-};
-
String RID_STR_FUNCTIONS
{
Text [ en-US ] = "Functions" ;
@@ -181,7 +174,7 @@ Menu RID_MENU_NAVIGATOR
{
ITEM_EDIT_PASTE
};
-*/
+*/
};
};
More information about the Libreoffice-commits
mailing list