diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-19 10:26:40 -0300 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-04-19 10:29:36 -0300 |
commit | 14480ef3f659f5559d0a73dfb8a3fecb9d3cd378 (patch) | |
tree | 09171582e5eee4ffb0370a2b25a70c9ec9001a36 /sd | |
parent | extension libs should have no RPATH (diff) | |
download | core-14480ef3f659f5559d0a73dfb8a3fecb9d3cd378.tar.gz core-14480ef3f659f5559d0a73dfb8a3fecb9d3cd378.zip |
Remove deprecated Notes windows in Impress/Draw
This code has not been built for a long time. I suspect it got replaced by the slides panel on the left of simpress main window.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/AllLangResTarget_sd.mk | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/NotesChildWindow.hrc | 30 | ||||
-rw-r--r-- | sd/source/ui/inc/NotesChildWindow.hxx | 58 | ||||
-rw-r--r-- | sd/source/ui/notes/EditWindow.cxx | 792 | ||||
-rw-r--r-- | sd/source/ui/notes/EditWindow.hxx | 130 | ||||
-rw-r--r-- | sd/source/ui/notes/NotesChildWindow.cxx | 64 | ||||
-rw-r--r-- | sd/source/ui/notes/NotesChildWindow.src | 46 | ||||
-rw-r--r-- | sd/source/ui/notes/NotesDockingWindow.cxx | 112 | ||||
-rw-r--r-- | sd/source/ui/notes/NotesDockingWindow.hxx | 59 | ||||
-rw-r--r-- | sd/source/ui/notes/TextLogger.cxx | 130 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 1 |
11 files changed, 0 insertions, 1423 deletions
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 92931c56aaca..89fc6a22581c 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -97,7 +97,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/dlg/tpaction.src \ sd/source/ui/dlg/tpoption.src \ sd/source/ui/dlg/vectdlg.src \ - sd/source/ui/notes/NotesChildWindow.src \ sd/source/ui/slideshow/slideshow.src \ sd/source/ui/slidesorter/view/SlsResource.src \ sd/source/ui/table/TableDesignPane.src \ diff --git a/sd/source/ui/inc/NotesChildWindow.hrc b/sd/source/ui/inc/NotesChildWindow.hrc deleted file mode 100644 index c25109d81a22..000000000000 --- a/sd/source/ui/inc/NotesChildWindow.hrc +++ /dev/null @@ -1,30 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define FLT_WIN_NOTES 790 - -#define NOTES 1 diff --git a/sd/source/ui/inc/NotesChildWindow.hxx b/sd/source/ui/inc/NotesChildWindow.hxx deleted file mode 100644 index 8287a2af5a52..000000000000 --- a/sd/source/ui/inc/NotesChildWindow.hxx +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_NOTES_CHILD_WINDOW_HXX -#define SD_NOTES_CHILD_WINDOW_HXX - -#include <sfx2/childwin.hxx> - -#define NOTES_CHILD_WINDOW() ( \ - static_cast< ::sd::toolpanel::NotesChildWindow*>( \ - SfxViewFrame::Current()->GetChildWindow( \ - ::sd::toolpanel::NotesChildWindow::GetChildWindowId() \ - )->GetWindow())) - - -namespace sd { namespace notes { - -class NotesChildWindow - : public SfxChildWindow -{ -public: - NotesChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); - virtual ~NotesChildWindow (void); - - SFX_DECL_CHILDWINDOW (NotesChildWindow); -}; - - -} } // end of namespaces ::sd::notes - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx deleted file mode 100644 index aa38c5373abd..000000000000 --- a/sd/source/ui/notes/EditWindow.cxx +++ /dev/null @@ -1,792 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "EditWindow.hxx" - -#include "sdmod.hxx" -#include <i18npool/mslangid.hxx> -#include <com/sun/star/i18n/ScriptType.hpp> -#include <editeng/editeng.hxx> -#include <editeng/editview.hxx> -#include <vcl/scrbar.hxx> -#include <editeng/eeitem.hxx> -#include "sdresid.hxx" -#include <svl/itempool.hxx> -#include <editeng/fhgtitem.hxx> -#include <osl/mutex.hxx> -#include <vcl/svapp.hxx> -#include <unotools/linguprops.hxx> -#include <unotools/lingucfg.hxx> -#include <editeng/fontitem.hxx> -#include <editeng/editstat.hxx> - -#define SCROLL_LINE 24 - -using namespace com::sun::star::accessibility; -using namespace com::sun::star; -using namespace com::sun::star::uno; - -namespace sd { namespace notes { - -EditWindow::EditWindow (Window* pParentWindow, SfxItemPool* pItemPool) - : Window (pParentWindow, WinBits()), - DropTargetHelper(this), - mpEditView(NULL), - mpEditEngine(NULL), - mpHorizontalScrollBar(NULL), - mpVerticalScrollBar(NULL), - mpScrollBox(NULL) -{ - SetMapMode(MAP_PIXEL); - - // compare DataChanged - SetBackground (GetSettings().GetStyleSettings().GetWindowColor()); - - maModifyTimer.SetTimeout(2000); - maModifyTimer.Start(); - - maCursorMoveTimer.SetTimeout(500); - - CreateEditView(); - - SvxFontHeightItem aItem (GetFont().GetSize().Height(), 100, - EE_CHAR_FONTHEIGHT); - pItemPool->SetPoolDefaultItem (aItem); - aItem.SetWhich(EE_CHAR_FONTHEIGHT_CJK); - pItemPool->SetPoolDefaultItem (aItem); - aItem.SetWhich(EE_CHAR_FONTHEIGHT_CTL); - pItemPool->SetPoolDefaultItem (aItem); - - InsertText (UniString::CreateFromAscii("EditWindow created and ready.\n")); -} - - -EditWindow::~EditWindow (void) -{ - maCursorMoveTimer.Stop(); - maModifyTimer.Stop(); - - if (mpEditView != NULL) - { - EditEngine *pEditEngine = mpEditView->GetEditEngine(); - if (pEditEngine) - { - pEditEngine->SetStatusEventHdl(Link()); - pEditEngine->RemoveView (mpEditView); - } - } - delete mpEditView; - delete mpHorizontalScrollBar; - delete mpVerticalScrollBar; - delete mpScrollBox; - -} - -//////////////////////////////////////// - - -void SmGetLeftSelectionPart(const ESelection aSel, - sal_uInt16 &nPara, sal_uInt16 &nPos) - // returns paragraph number and position of the selections left part -{ - // compare start and end of selection and use the one that comes first - if ( - (aSel.nStartPara < aSel.nEndPara) || - (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) - ) - { nPara = aSel.nStartPara; - nPos = aSel.nStartPos; - } - else - { nPara = aSel.nEndPara; - nPos = aSel.nEndPos; - } -} - - - - -EditEngine * EditWindow::GetEditEngine (void) -{ - if (mpEditEngine == NULL) - mpEditEngine = CreateEditEngine (); - return mpEditEngine; -} - - - - -EditEngine* EditWindow::CreateEditEngine (void) -{ - EditEngine* pEditEngine = mpEditEngine; - if (pEditEngine == NULL) - { - mpEditEngineItemPool = EditEngine::CreatePool(); - - // - // set fonts to be used - // - SvtLinguOptions aOpt; - SvtLinguConfig().GetOptions( aOpt ); - // - struct FontDta { - sal_Int16 nFallbackLang; - sal_Int16 nLang; - sal_uInt16 nFontType; - sal_uInt16 nFontInfoId; - } aTable[3] = - { - // info to get western font to be used - { LANGUAGE_ENGLISH_US, LANGUAGE_NONE, - DEFAULTFONT_SERIF, EE_CHAR_FONTINFO }, - // info to get CJK font to be used - { LANGUAGE_JAPANESE, LANGUAGE_NONE, - DEFAULTFONT_CJK_TEXT, EE_CHAR_FONTINFO_CJK }, - // info to get CTL font to be used - { LANGUAGE_ARABIC_SAUDI_ARABIA, LANGUAGE_NONE, - DEFAULTFONT_CTL_TEXT, EE_CHAR_FONTINFO_CTL } - }; - aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN); - aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN); - aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX); - // - for (int i = 0; i < 3; ++i) - { - const FontDta &rFntDta = aTable[i]; - LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ? - rFntDta.nFallbackLang : rFntDta.nLang; - Font aFont = Application::GetDefaultDevice()->GetDefaultFont( - rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE); - mpEditEngineItemPool->SetPoolDefaultItem( - SvxFontItem( - aFont.GetFamily(), - aFont.GetName(), - aFont.GetStyleName(), - aFont.GetPitch(), - aFont.GetCharSet(), - rFntDta.nFontInfoId)); - } - - // set font heights - SvxFontHeightItem aFontHeigt( - Application::GetDefaultDevice()->LogicToPixel( - Size (0, 10), MapMode (MAP_POINT)).Height(), 100, - EE_CHAR_FONTHEIGHT ); - mpEditEngineItemPool->SetPoolDefaultItem( aFontHeigt); - aFontHeigt.SetWhich (EE_CHAR_FONTHEIGHT_CJK); - mpEditEngineItemPool->SetPoolDefaultItem( aFontHeigt); - aFontHeigt.SetWhich (EE_CHAR_FONTHEIGHT_CTL); - mpEditEngineItemPool->SetPoolDefaultItem( aFontHeigt); - - pEditEngine = new EditEngine (mpEditEngineItemPool); - - pEditEngine->EnableUndo (sal_True); - pEditEngine->SetDefTab (sal_uInt16( - Application::GetDefaultDevice()->GetTextWidth( - UniString::CreateFromAscii("XXXX")))); - - pEditEngine->SetControlWord( - (pEditEngine->GetControlWord() - | EE_CNTRL_AUTOINDENTING) & - (~EE_CNTRL_UNDOATTRIBS) & - (~EE_CNTRL_PASTESPECIAL)); - - pEditEngine->SetWordDelimiters ( - UniString::CreateFromAscii(" .=+-*/(){}[];\"")); - pEditEngine->SetRefMapMode (MAP_PIXEL); - pEditEngine->SetPaperSize (Size(800, 0)); - pEditEngine->EraseVirtualDevice(); - pEditEngine->ClearModifyFlag(); - } - - return pEditEngine; -} - - - - -void EditWindow::DataChanged (const DataChangedEvent&) -{ - const StyleSettings aSettings (GetSettings().GetStyleSettings()); - - SetBackground( aSettings.GetWindowColor() ); - - // edit fields in other Applications use this font instead of - // the application font thus we use this one too - SetPointFont( aSettings.GetFieldFont() ); - EditEngine* pEditEngine = GetEditEngine(); - - if (pEditEngine!=NULL && mpEditEngineItemPool!=NULL) - { - //! - //! see also SmDocShell::GetEditEngine() ! - //! - - // pEditEngine->SetDefTab( sal_uInt16( GetTextWidth( C2S("XXXX") ) ) ); - - sal_uInt16 aFntInfoId[3] = { - EE_CHAR_FONTINFO, EE_CHAR_FONTINFO_CJK, EE_CHAR_FONTINFO_CTL }; - for (int i = 0; i < 3; ++i) - { - const SfxPoolItem *pItem = mpEditEngineItemPool->GetPoolDefaultItem( aFntInfoId[i] ); - if( pItem ) - { - const SvxFontItem *pFntItem = ((const SvxFontItem *) pItem); - const Font &rFnt = aSettings.GetFieldFont(); - SvxFontItem aFntItem( rFnt.GetFamily(), rFnt.GetName(), - rFnt.GetStyleName(), rFnt.GetPitch(), - pFntItem->GetCharSet(), - aFntInfoId[i] ); - mpEditEngineItemPool->SetPoolDefaultItem( aFntItem ); - } - } - - SvxFontHeightItem aItem( GetFont().GetSize().Height(), 100, - EE_CHAR_FONTHEIGHT ); - mpEditEngineItemPool->SetPoolDefaultItem( aItem ); - aItem.SetWhich( EE_CHAR_FONTHEIGHT_CJK ); - mpEditEngineItemPool->SetPoolDefaultItem( aItem ); - aItem.SetWhich( EE_CHAR_FONTHEIGHT_CTL ); - mpEditEngineItemPool->SetPoolDefaultItem( aItem ); - - // forces new settings to be used - // unfortunately this resets the whole edit engine - // thus we need to save at least the text - String aTxt( pEditEngine->GetText( LINEEND_LF ) ); - pEditEngine->Clear(); //#77957 incorrect font size - pEditEngine->SetText( aTxt ); - } - - String aText (mpEditEngine->GetText (LINEEND_LF)); - mpEditEngine->Clear(); - mpEditEngine->SetText (aText); - - AdjustScrollBars(); - Resize(); -} - - - - -void EditWindow::Resize (void) -{ - if (!mpEditView) - CreateEditView(); - - if (mpEditView != NULL) - { - mpEditView->SetOutputArea(AdjustScrollBars()); - mpEditView->ShowCursor(); - - DBG_ASSERT( mpEditView->GetEditEngine(), "EditEngine missing" ); - const long nMaxVisAreaStart = mpEditView->GetEditEngine()->GetTextHeight() - - mpEditView->GetOutputArea().GetHeight(); - if (mpEditView->GetVisArea().Top() > nMaxVisAreaStart) - { - Rectangle aVisArea(mpEditView->GetVisArea() ); - aVisArea.Top() = (nMaxVisAreaStart > 0 ) ? nMaxVisAreaStart : 0; - aVisArea.SetSize(mpEditView->GetOutputArea().GetSize()); - mpEditView->SetVisArea(aVisArea); - mpEditView->ShowCursor(); - } - InitScrollBars(); - } - Invalidate(); -} - - - - -void EditWindow::MouseButtonUp(const MouseEvent &rEvt) -{ - if (mpEditView != NULL) - mpEditView->MouseButtonUp(rEvt); - else - Window::MouseButtonUp (rEvt); - - // ggf FormulaCursor neu positionieren - // CursorMoveTimerHdl(&aCursorMoveTimer); -} - - - - -void EditWindow::MouseButtonDown(const MouseEvent &rEvt) -{ - if (mpEditView != NULL) - mpEditView->MouseButtonDown(rEvt); - else - Window::MouseButtonDown (rEvt); - - GrabFocus(); -} - - - - -void EditWindow::Command(const CommandEvent& rCEvt) -{ - if (mpEditView) - mpEditView->Command( rCEvt ); - else - Window::Command (rCEvt); - -} -IMPL_LINK_NOARG_INLINE_START(EditWindow, MenuSelectHdl) -{ - return 0; -} -IMPL_LINK_NOARG_INLINE_END(EditWindow, MenuSelectHdl) - -void EditWindow::KeyInput(const KeyEvent& ) -{ - -} - - - - -void EditWindow::Paint(const Rectangle& rRect) -{ - if (!mpEditView) - CreateEditView(); - mpEditView->Paint(rRect); -} - - - - -void EditWindow::CreateEditView (void) -{ - EditEngine* pEditEngine = GetEditEngine(); - - //! pEditEngine and mpEditView may be 0. - //! For example when the program is used by the document-converter - if (mpEditView==NULL && pEditEngine!=NULL) - { - mpEditView = new EditView (pEditEngine, this); - pEditEngine->InsertView (mpEditView); - - if (mpVerticalScrollBar == NULL) - mpVerticalScrollBar = new ScrollBar ( - this, WinBits(WB_VSCROLL | WB_DRAG)); - if (mpHorizontalScrollBar == NULL) - mpHorizontalScrollBar = new ScrollBar ( - this, WinBits(WB_HSCROLL | WB_DRAG)); - if (mpScrollBox == NULL) - mpScrollBox = new ScrollBarBox (this); - mpVerticalScrollBar->SetScrollHdl(LINK(this, EditWindow, ScrollHdl)); - mpHorizontalScrollBar->SetScrollHdl(LINK(this, EditWindow, ScrollHdl)); - - mpEditView->SetOutputArea(AdjustScrollBars()); - - ESelection eSelection; - - mpEditView->SetSelection(eSelection); - Update(); - mpEditView->ShowCursor(sal_True, sal_True); - - pEditEngine->SetStatusEventHdl( - LINK(this, EditWindow, EditStatusHdl)); - SetPointer(mpEditView->GetPointer()); - - SetScrollBarRanges(); - } -} - - - - -IMPL_LINK_NOARG(EditWindow, EditStatusHdl) -{ - if (!mpEditView) - return 1; - else - { - SetScrollBarRanges(); - return 0; - } -} - -IMPL_LINK_NOARG_INLINE_START(EditWindow, ScrollHdl) -{ - DBG_ASSERT(mpEditView, "EditView missing"); - if (mpEditView) - { - mpEditView->SetVisArea(Rectangle(Point(mpHorizontalScrollBar->GetThumbPos(), - mpVerticalScrollBar->GetThumbPos()), - mpEditView->GetVisArea().GetSize())); - mpEditView->Invalidate(); - } - return 0; -} -IMPL_LINK_NOARG_INLINE_END(EditWindow, ScrollHdl) - -Rectangle EditWindow::AdjustScrollBars() -{ - const Size aOut( GetOutputSizePixel() ); - Point aPoint; - Rectangle aRect( aPoint, aOut ); - - if (mpVerticalScrollBar && mpHorizontalScrollBar && mpScrollBox) - { - const long nTmp = GetSettings().GetStyleSettings().GetScrollBarSize(); - Point aPt( aRect.TopRight() ); aPt.X() -= nTmp -1L; - mpVerticalScrollBar->SetPosSizePixel( aPt, Size(nTmp, aOut.Height() - nTmp)); - - aPt = aRect.BottomLeft(); aPt.Y() -= nTmp - 1L; - mpHorizontalScrollBar->SetPosSizePixel( aPt, Size(aOut.Width() - nTmp, nTmp)); - - aPt.X() = mpHorizontalScrollBar->GetSizePixel().Width(); - aPt.Y() = mpVerticalScrollBar->GetSizePixel().Height(); - mpScrollBox->SetPosSizePixel(aPt, Size(nTmp, nTmp )); - - aRect.Right() = aPt.X() - 2; - aRect.Bottom() = aPt.Y() - 2; - } - return aRect; -} - -void EditWindow::SetScrollBarRanges() -{ - EditEngine* pEditEngine = GetEditEngine(); - if (mpEditView != NULL && pEditEngine != NULL) - { - if (mpVerticalScrollBar != NULL) - { - long nTmp = pEditEngine->GetTextHeight(); - mpVerticalScrollBar->SetRange(Range(0, nTmp)); - mpVerticalScrollBar->SetThumbPos(mpEditView->GetVisArea().Top()); - } - if (mpHorizontalScrollBar != NULL) - { - long nTmp = pEditEngine->GetPaperSize().Width(); - mpHorizontalScrollBar->SetRange(Range(0,nTmp)); - mpHorizontalScrollBar->SetThumbPos(mpEditView->GetVisArea().Left()); - } - } -} - -void EditWindow::InitScrollBars() -{ - if (mpEditView != NULL) - { - const Size aOut( mpEditView->GetOutputArea().GetSize() ); - if (mpVerticalScrollBar != NULL) - { - mpVerticalScrollBar->SetVisibleSize(aOut.Height()); - mpVerticalScrollBar->SetPageSize(aOut.Height() * 8 / 10); - mpVerticalScrollBar->SetLineSize(aOut.Height() * 2 / 10); - } - - if (mpHorizontalScrollBar != NULL) - { - mpHorizontalScrollBar->SetVisibleSize(aOut.Width()); - mpHorizontalScrollBar->SetPageSize(aOut.Width() * 8 / 10); - mpHorizontalScrollBar->SetLineSize(SCROLL_LINE ); - } - - SetScrollBarRanges(); - - if (mpVerticalScrollBar != NULL) - mpVerticalScrollBar->Show(); - if (mpHorizontalScrollBar != NULL) - mpHorizontalScrollBar->Show(); - if (mpScrollBox != NULL) - mpScrollBox->Show(); - } -} - - -XubString EditWindow::GetText() -{ - String aText; - EditEngine *pEditEngine = GetEditEngine(); - DBG_ASSERT( pEditEngine, "EditEngine missing" ); - if (pEditEngine) - aText = pEditEngine->GetText( LINEEND_LF ); - return aText; -} - - -void EditWindow::SetText(const XubString& rText) -{ - EditEngine *pEditEngine = GetEditEngine(); - DBG_ASSERT( pEditEngine, "EditEngine missing" ); - if (pEditEngine && !pEditEngine->IsModified()) - { - if (!mpEditView) - CreateEditView(); - - ESelection eSelection = mpEditView->GetSelection(); - - pEditEngine->SetText(rText); - pEditEngine->ClearModifyFlag(); - - //! Hier die Timer neu zu starten verhindert, dass die Handler f�r andere - //! (im Augenblick nicht mehr aktive) Math Tasks aufgerufen werden. - maModifyTimer.Start(); - maCursorMoveTimer.Start(); - - mpEditView->SetSelection(eSelection); - } -} - - -void EditWindow::GetFocus() -{ - Window::GetFocus(); - - if (!mpEditView) - CreateEditView(); - if (mpEditEngine != NULL) - mpEditEngine->SetStatusEventHdl( - LINK(this, EditWindow, EditStatusHdl)); -} - - -void EditWindow::LoseFocus() -{ - if (mpEditEngine != NULL) - mpEditEngine->SetStatusEventHdl (Link()); - - Window::LoseFocus(); -} - - -sal_Bool EditWindow::IsAllSelected() const -{ - sal_Bool bRes = sal_False; - EditEngine *pEditEngine = ((EditWindow *) this)->GetEditEngine(); - DBG_ASSERT( mpEditView, "NULL pointer" ); - DBG_ASSERT( pEditEngine, "NULL pointer" ); - if (pEditEngine && mpEditView) - { - ESelection eSelection( mpEditView->GetSelection() ); - sal_Int32 nParaCnt = pEditEngine->GetParagraphCount(); - if (!(nParaCnt - 1)) - { - String Text( pEditEngine->GetText( LINEEND_LF ) ); - bRes = !eSelection.nStartPos && (eSelection.nEndPos == Text.Len () - 1); - } - else - { - bRes = !eSelection.nStartPara && (eSelection.nEndPara == nParaCnt - 1); - } - } - return bRes; -} - -void EditWindow::SelectAll() -{ - DBG_ASSERT( mpEditView, "NULL pointer" ); - if (mpEditView) - { - // 0xFFFF as last two parameters refers to the end of the text - mpEditView->SetSelection( ESelection( 0, 0, 0xFFFF, 0xFFFF ) ); - } -} - - -void EditWindow::MarkError(const Point &rPos) -{ - DBG_ASSERT( mpEditView, "EditView missing" ); - if (mpEditView) - { - const int Col = rPos.X(); - const int Row = rPos.Y() - 1; - - mpEditView->SetSelection(ESelection ( (sal_uInt16)Row, (sal_uInt16)(Col - 1), (sal_uInt16)Row, (sal_uInt16)Col)); - GrabFocus(); - } -} - -void EditWindow::SelNextMark() -{ - EditEngine *pEditEngine = GetEditEngine(); - DBG_ASSERT( mpEditView, "NULL pointer" ); - DBG_ASSERT( pEditEngine, "NULL pointer" ); - if (pEditEngine && mpEditView) - { - ESelection eSelection = mpEditView->GetSelection(); - sal_uInt16 Pos = eSelection.nEndPos; - String aMark (UniString::CreateFromAscii("<?>")); - String aText; - sal_uInt16 nCounts = pEditEngine->GetParagraphCount(); - - while (eSelection.nEndPara < nCounts) - { - aText = pEditEngine->GetText( eSelection.nEndPara ); - Pos = aText.Search(aMark, Pos); - - if (Pos != STRING_NOTFOUND) - { - mpEditView->SetSelection(ESelection (eSelection.nEndPara, Pos, eSelection.nEndPara, Pos + 3)); - break; - } - - Pos = 0; - eSelection.nEndPara++; - } - } -} - -void EditWindow::SelPrevMark() -{ - EditEngine *pEditEngine = GetEditEngine(); - DBG_ASSERT( pEditEngine, "NULL pointer" ); - DBG_ASSERT( mpEditView, "NULL pointer" ); - if (pEditEngine && mpEditView) - { - ESelection eSelection = mpEditView->GetSelection(); - sal_uInt16 Pos = STRING_NOTFOUND; - xub_StrLen Max = eSelection.nStartPos; - String Text( pEditEngine->GetText( eSelection.nStartPara ) ); - String aMark (UniString::CreateFromAscii("<?>")); - sal_uInt16 nCounts = pEditEngine->GetParagraphCount(); - - do - { - sal_uInt16 Fnd = Text.Search(aMark, 0); - - while ((Fnd < Max) && (Fnd != STRING_NOTFOUND)) - { - Pos = Fnd; - Fnd = Text.Search(aMark, Fnd + 1); - } - - if (Pos == STRING_NOTFOUND) - { - eSelection.nStartPara--; - Text = pEditEngine->GetText( eSelection.nStartPara ); - Max = Text.Len(); - } - } - while ((eSelection.nStartPara < nCounts) && - (Pos == STRING_NOTFOUND)); - - if (Pos != STRING_NOTFOUND) - { - mpEditView->SetSelection(ESelection (eSelection.nStartPara, Pos, eSelection.nStartPara, Pos + 3)); - } - } -} - -sal_Bool EditWindow::HasMark(const String& rText) const - // returns true iff 'rText' contains a mark -{ - return rText.SearchAscii("<?>", 0) != STRING_NOTFOUND; -} - -void EditWindow::MouseMove(const MouseEvent &rEvt) -{ - if (mpEditView) - mpEditView->MouseMove(rEvt); -} - -sal_Int8 EditWindow::AcceptDrop( const AcceptDropEvent& ) -{ - return mpEditView ? /*mpEditView->QueryDrop( rEvt )*/DND_ACTION_NONE: DND_ACTION_NONE; -} - -sal_Int8 EditWindow::ExecuteDrop( const ExecuteDropEvent& ) -{ - return mpEditView ? /*mpEditView->Drop( rEvt )*/DND_ACTION_NONE : DND_ACTION_NONE; -} - -ESelection EditWindow::GetSelection() const -{ - // pointer may be 0 when reloading a document and the old view - // was already destroyed - //(DBG_ASSERT( mpEditView, "NULL pointer" ); - ESelection eSel; - if (mpEditView) - eSel = mpEditView->GetSelection(); - return eSel; -} - -void EditWindow::SetSelection(const ESelection &rSel) -{ - DBG_ASSERT( mpEditView, "NULL pointer" ); - if (mpEditView) - mpEditView->SetSelection(rSel); -} - -sal_Bool EditWindow::IsEmpty() const -{ - EditEngine *pEditEngine = ((EditWindow *) this)->GetEditEngine(); - return (pEditEngine && (pEditEngine->GetTextLen() == 0)) ? sal_True : sal_False; -} - -sal_Bool EditWindow::IsSelected() const -{ - return mpEditView ? mpEditView->HasSelection() : sal_False; -} - -void EditWindow::Cut() -{ - DBG_ASSERT( mpEditView, "EditView missing" ); - if (mpEditView) - mpEditView->Cut(); -} - -void EditWindow::Copy() -{ - DBG_ASSERT( mpEditView, "EditView missing" ); - if (mpEditView) - mpEditView->Copy(); -} - -void EditWindow::Paste() -{ - DBG_ASSERT( mpEditView, "EditView missing" ); - if (mpEditView) - mpEditView->Paste(); -} - -void EditWindow::Delete() -{ - DBG_ASSERT( mpEditView, "EditView missing" ); - if (mpEditView) - mpEditView->DeleteSelected(); -} - -void EditWindow::InsertText(const String& Text) -{ - DBG_ASSERT( mpEditView, "EditView missing" ); - SolarMutexGuard aGuard; - if (mpEditView) - mpEditView->InsertText(Text); -} - - - -} } // end of namespace ::sd::notes - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/notes/EditWindow.hxx b/sd/source/ui/notes/EditWindow.hxx deleted file mode 100644 index e6d1e6fa79ea..000000000000 --- a/sd/source/ui/notes/EditWindow.hxx +++ /dev/null @@ -1,130 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_EDIT_WINDOW_HXX -#define SD_EDIT_WINDOW_HXX - -#include <vcl/window.hxx> -#include <svtools/transfer.hxx> -#include <vcl/timer.hxx> -#include <editeng/editdata.hxx> -#include <svtools/colorcfg.hxx> - -class EditEngine; -class EditStatus; -class EditView; -class Menu; -class ScrollBar; -class ScrollBarBox; -class SfxItemPool; -class Timer; - - -namespace sd { namespace notes { - -class EditWindow - : public Window, - public DropTargetHelper -{ -public: - EditWindow (Window* pParentWindow, SfxItemPool* pItemPool); - ~EditWindow (void); - - void InsertText (const String &rText); - - using Window::GetText; -private: - EditView* mpEditView; - EditEngine* mpEditEngine; - SfxItemPool* mpEditEngineItemPool; - ScrollBar* mpHorizontalScrollBar; - ScrollBar* mpVerticalScrollBar; - ScrollBarBox* mpScrollBox; - Timer maModifyTimer; - Timer maCursorMoveTimer; - ESelection maOldSelection; - - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void Command(const CommandEvent& rCEvt); - DECL_LINK(MenuSelectHdl, Menu *); - - virtual void DataChanged( const DataChangedEvent& ); - virtual void Resize(); - virtual void MouseMove(const MouseEvent &rEvt); - virtual void MouseButtonUp(const MouseEvent &rEvt); - virtual void MouseButtonDown(const MouseEvent &rEvt); - - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void Paint(const Rectangle& rRect); - - DECL_LINK(EditStatusHdl ,EditStatus *); - DECL_LINK(ScrollHdl, ScrollBar *); - - void CreateEditView(); - - Rectangle AdjustScrollBars(); - void SetScrollBarRanges(); - void InitScrollBars(); - - // SmDocShell * GetDoc(); - // SmViewShell * GetView(); - EditView* GetEditView (void); - EditEngine* GetEditEngine (void); - EditEngine* CreateEditEngine (void); - - // Window - virtual void SetText(const XubString &rText); - virtual XubString GetText(); - virtual void GetFocus(); - virtual void LoseFocus(); - - ESelection GetSelection() const; - void SetSelection(const ESelection &rSel); - - sal_Bool IsEmpty() const; - sal_Bool IsSelected() const; - sal_Bool IsAllSelected() const; - void Cut(); - void Copy(); - void Paste(); - void Delete(); - void SelectAll(); - void MarkError(const Point &rPos); - void SelNextMark(); - void SelPrevMark(); - sal_Bool HasMark(const String &rText) const; - - void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg ); -}; - -} } // end of namespace ::sd::notes - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/notes/NotesChildWindow.cxx b/sd/source/ui/notes/NotesChildWindow.cxx deleted file mode 100644 index 83a6ba542757..000000000000 --- a/sd/source/ui/notes/NotesChildWindow.cxx +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "NotesChildWindow.hxx" -#include "NotesDockingWindow.hxx" - -#include "sdresid.hxx" -#include "app.hrc" -#include "sfx2/app.hxx" - -namespace sd { namespace notes { - -NotesChildWindow::NotesChildWindow ( - ::Window* _pParent, - sal_uInt16 nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo) - : SfxChildWindow (_pParent, nId) -{ - pWindow = new NotesDockingWindow (pBindings, this, _pParent); - eChildAlignment = SFX_ALIGN_BOTTOM; - static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo); -}; - - - - -NotesChildWindow::~NotesChildWindow() -{} - - -SFX_IMPL_DOCKINGWINDOW(NotesChildWindow, SID_NOTES_WINDOW) - - - -} } // end of namespace ::sd::notes - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/notes/NotesChildWindow.src b/sd/source/ui/notes/NotesChildWindow.src deleted file mode 100644 index 14ac956ce9e3..000000000000 --- a/sd/source/ui/notes/NotesChildWindow.src +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "app.hrc" -#include "NotesChildWindow.hrc" -#include "sdcommands.h" - -DockingWindow FLT_WIN_NOTES -{ - HelpID = CMD_SID_NOTES_WINDOW ; - Border = TRUE ; - Hide = FALSE ; - SVLook = TRUE ; - Sizeable = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Dockable = TRUE ; - EnableResizing = TRUE ; - Size = MAP_APPFONT ( 140 , 120 ) ; - Text [ en-US ] = "Notes Window" ; -}; diff --git a/sd/source/ui/notes/NotesDockingWindow.cxx b/sd/source/ui/notes/NotesDockingWindow.cxx deleted file mode 100644 index aca9e2830846..000000000000 --- a/sd/source/ui/notes/NotesDockingWindow.cxx +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "NotesDockingWindow.hxx" -#include "NotesChildWindow.hrc" - -#include "EditWindow.hxx" -#include "TextLogger.hxx" -#include <svx/dlgctrl.hxx> -#include <sfx2/bindings.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/viewfrm.hxx> -#include "DrawViewShell.hxx" -#include "drawdoc.hxx" -#include "sdresid.hxx" -#include "ViewShellBase.hxx" - -namespace sd { namespace notes { - -NotesDockingWindow::NotesDockingWindow ( - SfxBindings *_pBindings, - SfxChildWindow *pChildWindow, - Window* _pParent) - : SfxDockingWindow (_pBindings, pChildWindow, _pParent, - SdResId(FLT_WIN_NOTES)) -{ - ViewShellBase* pBase = ViewShellBase::GetViewShellBase ( - _pBindings->GetDispatcher()->GetFrame()); - if (pBase != NULL) - { - SdDrawDocument* pDocument = pBase->GetDocument(); - mpEditWindow = new EditWindow (this, &pDocument->GetPool()); - mpEditWindow->Show(); - TextLogger::Instance().ConnectToEditWindow (mpEditWindow); - } -} - - - - -NotesDockingWindow::~NotesDockingWindow (void) -{ - delete mpEditWindow; -} - - - - -void NotesDockingWindow::Paint (const Rectangle& rBoundingBox) -{ - SfxDockingWindow::Paint (rBoundingBox); - - Size aWindowSize (GetOutputSizePixel()); - Rectangle aBBox; - Point aPosition(10,aWindowSize.Height()/2); - String aString (UniString::CreateFromAscii("Bottom Panel Docking Window")); - if (GetTextBoundRect (aBBox, aString)) - aPosition = Point ( - (aWindowSize.Width()-aBBox.GetWidth())/2, - (aWindowSize.Height()-aBBox.GetHeight())/2); - - DrawText (aPosition, aString); -} - - - - -void NotesDockingWindow::Resize (void) -{ - SfxDockingWindow::Resize(); - - Size aWinSize (GetOutputSizePixel()); - - if (mpEditWindow != NULL) - { - mpEditWindow->SetPosSizePixel ( - Point(0,0), - aWinSize); - } -} - - - -} } // end of namespace ::sd::notes - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/notes/NotesDockingWindow.hxx b/sd/source/ui/notes/NotesDockingWindow.hxx deleted file mode 100644 index 3e41a7bafbb2..000000000000 --- a/sd/source/ui/notes/NotesDockingWindow.hxx +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_TPV_BOTTOM_DOCKING_WINDOW_HXX_ -#define SD_TPV_BOTTOM_DOCKING_WINDOW_HXX_ - -#include <sfx2/dockwin.hxx> - -namespace sd { namespace notes { - -class EditWindow; - -class NotesDockingWindow - : public SfxDockingWindow -{ -public: - NotesDockingWindow ( - SfxBindings *pBindings, - SfxChildWindow *pChildWindow, - Window* pParent); - virtual ~NotesDockingWindow (void); - - virtual void Paint (const Rectangle& rBoundingBox); - virtual void Resize (void); - -private: - EditWindow* mpEditWindow; -}; - -} } // end of namespace ::sd::notes - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/notes/TextLogger.cxx b/sd/source/ui/notes/TextLogger.cxx deleted file mode 100644 index 33d5fd55e127..000000000000 --- a/sd/source/ui/notes/TextLogger.cxx +++ /dev/null @@ -1,130 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "TextLogger.hxx" - -#include "EditWindow.hxx" -#include <osl/mutex.hxx> -#include <vcl/svapp.hxx> - -namespace sd { namespace notes { - -TextLogger* TextLogger::spInstance = NULL; - -TextLogger& TextLogger::Instance (void) -{ - if (spInstance == NULL) - { - SolarMutexGuard aGuard; - if (spInstance == NULL) - spInstance = new TextLogger (); - } - return *spInstance; -} - - - - -TextLogger::TextLogger (void) - : mpEditWindow (NULL) -{ -} - - - - -void TextLogger::AppendText (const char* sText) -{ - OSL_TRACE("%s", sText); - if (mpEditWindow != NULL) - mpEditWindow->InsertText (UniString::CreateFromAscii(sText)); -} - - - - -void TextLogger::AppendText (const String& sText) -{ - rtl::OString s(rtl::OUStringToOString(sText, RTL_TEXTENCODING_ISO_8859_1)); - OSL_TRACE("%s", s.getStr()); - if (mpEditWindow != NULL) - mpEditWindow->InsertText (sText); -} - - - - -void TextLogger::AppendNumber (long int nValue) -{ - AppendText (String::CreateFromInt32(nValue)); -} - - - - -void TextLogger::ConnectToEditWindow (EditWindow* pEditWindow) -{ - if (mpEditWindow != pEditWindow) - { - if (pEditWindow != NULL) - pEditWindow->AddEventListener( - LINK(this, TextLogger, WindowEventHandler)); - else - mpEditWindow->RemoveEventListener( - LINK(this, TextLogger, WindowEventHandler)); - - mpEditWindow = pEditWindow; - } -} - - - - -IMPL_LINK(TextLogger, WindowEventHandler, VclWindowEvent*, pEvent) -{ - if (pEvent != NULL) - { - DBG_ASSERT(static_cast<VclWindowEvent*>(pEvent)->GetWindow() - == mpEditWindow, - "TextLogger: received event from unknown window"); - switch (pEvent->GetId()) - { - case VCLEVENT_WINDOW_CLOSE: - case VCLEVENT_OBJECT_DYING: - mpEditWindow = NULL; - break; - } - } - return sal_True; -} - - -} } // end of namespace ::sd::notes - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 7f514f32ea61..5c2c43a7052d 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -46,7 +46,6 @@ #include "DrawDocShell.hxx" #include <sfx2/app.hxx> #include "PaneChildWindows.hxx" -#include "NotesChildWindow.hxx" #include "ViewShellManager.hxx" #include "DrawController.hxx" #include "FrameView.hxx" |