diff options
Diffstat (limited to 'svx/source/form/datanavi.cxx')
| -rw-r--r-- | svx/source/form/datanavi.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index c5af260f72..c54c9f8e65 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> -#include <svtools/svtools.hrc> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> +#include <svl/svtools.hrc> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/objitem.hxx> @@ -778,7 +778,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvLBoxEntry* pParent = m_aItemList.FirstSelected(); - const ImageList& rImageList = GetBackground().GetColor().IsDark() + const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() ? m_pNaviWin->GetItemHCImageList() : m_pNaviWin->GetItemImageList(); USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; @@ -816,8 +816,8 @@ namespace svxform // create a resource manager, for the svx resource file // and the UI locale ByteString aResourceFile( "svx" ); - ResMgr* pResMgr = ResMgr::CreateResMgr( - aResourceFile.GetBuffer(), + ResMgr* pResMgr = ResMgr::CreateResMgr( + aResourceFile.GetBuffer(), Application::GetSettings().GetUILocale() ); // load the resources for the AddSubmission modal dialog. @@ -833,7 +833,7 @@ namespace svxform // clean up: remove context, and delete the resource manager // ( Increment(..) is needed since PopContext() requires that // the file pointer is at the end. ) - pResMgr->Increment( pResMgr->GetRemainSize() ); + pResMgr->Increment( pResMgr->GetRemainSize() ); pResMgr->PopContext(); delete pResMgr; } @@ -988,7 +988,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvLBoxEntry* pEntry = NULL; - const ImageList& rImageList = GetBackground().GetColor().IsDark() + const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() ? m_pNaviWin->GetItemHCImageList() : m_pNaviWin->GetItemImageList(); Image aImage = rImageList.GetImage( IID_ELEMENT ); @@ -1244,7 +1244,7 @@ namespace svxform m_xUIHelper = Reference< css::xforms::XFormsUIHelper1 >( _xModel, UNO_QUERY ); String sRet; m_bHasModel = true; - const ImageList& rImageList = GetBackground().GetColor().IsDark() + const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() ? m_pNaviWin->GetItemHCImageList() : m_pNaviWin->GetItemImageList(); @@ -1608,10 +1608,10 @@ namespace svxform ActivatePageHdl( &m_aTabCtrl ); // get our frame - DBG_ASSERT( pBindings != NULL, + DBG_ASSERT( pBindings != NULL, "DataNavigatorWindow::LoadModels(): no SfxBindings; can't get frame" ); - m_xFrame = Reference<XFrame>( - pBindings->GetDispatcher()->GetFrame()->GetFrame()->GetFrameInterface(), + m_xFrame = Reference<XFrame>( + pBindings->GetDispatcher()->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY ); DBG_ASSERT( m_xFrame.is(), "DataNavigatorWindow::LoadModels(): no frame" ); // add frameaction listener @@ -3566,13 +3566,13 @@ namespace svxform } } - // #i36342# we need a temporary binding; create one if no existing binding + // #i36342# we need a temporary binding; create one if no existing binding // is found if( !m_xTempBinding.is() ) { - m_xCreatedBinding = m_xUIHelper->getBindingForNode( - Reference<css::xml::dom::XNode>( - xModel->getDefaultInstance()->getDocumentElement(), + m_xCreatedBinding = m_xUIHelper->getBindingForNode( + Reference<css::xml::dom::XNode>( + xModel->getDefaultInstance()->getDocumentElement(), UNO_QUERY_THROW ), sal_True ); m_xTempBinding = m_xCreatedBinding; |