diff options
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r-- | dbaccess/source/ui/app/AppIconControl.cxx | 22 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppSwapWindow.cxx | 24 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppTitleWindow.cxx | 15 | ||||
-rw-r--r-- | dbaccess/source/ui/app/templwin.hxx | 3 |
4 files changed, 26 insertions, 38 deletions
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index d481077bdd49..0ae6f1eff01b 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -33,7 +33,6 @@ namespace dbaui { - class OApplicationIconControlDropTarget final : public DropTargetHelper { private: @@ -75,17 +74,16 @@ void OApplicationIconControl::Fill() const char* pLabelResId; ElementType eType; const char* aImageResId; - } aCategories[] = { - { RID_STR_TABLES_CONTAINER, E_TABLE, BMP_TABLEFOLDER_TREE_L }, - { RID_STR_QUERIES_CONTAINER, E_QUERY, BMP_QUERYFOLDER_TREE_L }, - { RID_STR_FORMS_CONTAINER, E_FORM, BMP_FORMFOLDER_TREE_L }, - { RID_STR_REPORTS_CONTAINER, E_REPORT, BMP_REPORTFOLDER_TREE_L } - }; + } aCategories[] = { { RID_STR_TABLES_CONTAINER, E_TABLE, BMP_TABLEFOLDER_TREE_L }, + { RID_STR_QUERIES_CONTAINER, E_QUERY, BMP_QUERYFOLDER_TREE_L }, + { RID_STR_FORMS_CONTAINER, E_FORM, BMP_FORMFOLDER_TREE_L }, + { RID_STR_REPORTS_CONTAINER, E_REPORT, BMP_REPORTFOLDER_TREE_L } }; for (const CategoryDescriptor& aCategorie : aCategories) { // E_TABLE is 0, but 0 means void so use id of enum + 1 - std::unique_ptr<ThumbnailViewItem> xItem(new ThumbnailViewItem(*this, aCategorie.eType + 1)); + std::unique_ptr<ThumbnailViewItem> xItem( + new ThumbnailViewItem(*this, aCategorie.eType + 1)); xItem->mbBorder = false; xItem->maPreview1 = BitmapEx(OUString::createFromAscii(aCategorie.aImageResId)); const Size& rSize = xItem->maPreview1.GetSizePixel(); @@ -186,7 +184,8 @@ sal_Int8 OApplicationIconControl::AcceptDrop(const AcceptDropEvent& rEvt) { deselectItems(); SelectItem(nEntry); - nDropOption = m_pActionListener->queryDrop(rEvt, m_xDropTarget->GetDataFlavorExVector()); + nDropOption + = m_pActionListener->queryDrop(rEvt, m_xDropTarget->GetDataFlavorExVector()); } } return nDropOption; @@ -199,9 +198,7 @@ sal_Int8 OApplicationIconControl::ExecuteDrop(const ExecuteDropEvent& rEvt) return DND_ACTION_NONE; } -OApplicationIconControl::~OApplicationIconControl() -{ -} +OApplicationIconControl::~OApplicationIconControl() {} void OApplicationIconControl::GetFocus() { @@ -236,7 +233,6 @@ tools::Rectangle OApplicationIconControl::GetFocusRect() } return tools::Rectangle(); } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 01952da0eb03..ea2066c729c1 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -32,7 +32,8 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -OApplicationSwapWindow::OApplicationSwapWindow(weld::Container* pParent, OAppBorderWindow& rBorderWindow) +OApplicationSwapWindow::OApplicationSwapWindow(weld::Container* pParent, + OAppBorderWindow& rBorderWindow) : OChildWindow(pParent, "dbaccess/ui/appswapwindow.ui", "AppSwapWindow") , m_xIconControl(new OApplicationIconControl(m_xBuilder->weld_scrolled_window("scroll", true))) , m_xIconControlWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xIconControl)) @@ -45,7 +46,7 @@ OApplicationSwapWindow::OApplicationSwapWindow(weld::Container* pParent, OAppBor m_xIconControl->SetHelpId(HID_APP_SWAP_ICONCONTROL); m_xIconControl->Fill(); m_xIconControl->setItemStateHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl)); - m_xIconControl->setControlActionListener( &m_rBorderWin.getView()->getAppController() ); + m_xIconControl->setControlActionListener(&m_rBorderWin.getView()->getAppController()); } void OApplicationSwapWindow::GrabFocus() @@ -76,11 +77,11 @@ void OApplicationSwapWindow::createIconAutoMnemonics(MnemonicGenerator& rMnemoni m_xIconControl->createIconAutoMnemonics(rMnemonics); } -bool OApplicationSwapWindow::interceptKeyInput( const KeyEvent& _rEvent ) +bool OApplicationSwapWindow::interceptKeyInput(const KeyEvent& _rEvent) { const vcl::KeyCode& rKeyCode = _rEvent.GetKeyCode(); - if ( rKeyCode.GetModifier() == KEY_MOD2 ) - return m_xIconControl->DoKeyShortCut( _rEvent ); + if (rKeyCode.GetModifier() == KEY_MOD2) + return m_xIconControl->DoKeyShortCut(_rEvent); // not handled return false; } @@ -90,20 +91,21 @@ ElementType OApplicationSwapWindow::getElementType() const return m_xIconControl->GetSelectedItem(); } -bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) +bool OApplicationSwapWindow::onContainerSelected(ElementType _eType) { - if ( m_eLastType == _eType ) + if (m_eLastType == _eType) return true; - if ( m_rBorderWin.getView()->getAppController().onContainerSelect( _eType ) ) + if (m_rBorderWin.getView()->getAppController().onContainerSelect(_eType)) { - if ( _eType != E_NONE ) + if (_eType != E_NONE) m_eLastType = _eType; return true; } if (!m_nChangeEvent) - m_nChangeEvent = Application::PostUserEvent(LINK(this, OApplicationSwapWindow, ChangeToLastSelected)); + m_nChangeEvent + = Application::PostUserEvent(LINK(this, OApplicationSwapWindow, ChangeToLastSelected)); return false; } @@ -112,7 +114,7 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, const ThumbnailViewItem* if (pEntry->mbSelected) { ElementType eType = static_cast<ElementType>(pEntry->mnId - 1); - onContainerSelected( eType ); // i87582 + onContainerSelected(eType); // i87582 } } diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index d69aabf6f032..9927b49b2956 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -23,7 +23,6 @@ namespace dbaui { - OTitleWindow::OTitleWindow(weld::Container* pParent, const char* pTitleId) : m_xBuilder(Application::CreateBuilder(pParent, "dbaccess/ui/titlewindow.ui")) , m_xContainer(m_xBuilder->weld_container("TitleWindow")) @@ -38,14 +37,9 @@ OTitleWindow::OTitleWindow(weld::Container* pParent, const char* pTitleId) m_xTitle->set_label_type(weld::LabelType::Title); } -OTitleWindow::~OTitleWindow() -{ -} +OTitleWindow::~OTitleWindow() {} -weld::Container* OTitleWindow::getChildContainer() -{ - return m_xChildContainer.get(); -} +weld::Container* OTitleWindow::getChildContainer() { return m_xChildContainer.get(); } void OTitleWindow::setChildWindow(const std::shared_ptr<OChildWindow>& rChild) { @@ -65,10 +59,7 @@ void OTitleWindow::GrabFocus() m_xChild->GrabFocus(); } -bool OTitleWindow::HasChildPathFocus() const -{ - return m_xChild && m_xChild->HasChildPathFocus(); -} +bool OTitleWindow::HasChildPathFocus() const { return m_xChild && m_xChild->HasChildPathFocus(); } } // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/templwin.hxx b/dbaccess/source/ui/app/templwin.hxx index 1a3f435af272..8978a6ea3e17 100644 --- a/dbaccess/source/ui/app/templwin.hxx +++ b/dbaccess/source/ui/app/templwin.hxx @@ -22,8 +22,7 @@ namespace SvtDocInfoTable_Impl { - OUString GetString(int nId); +OUString GetString(int nId); }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |