diff options
Diffstat (limited to 'sd/source/ui/annotations/annotationwindow.cxx')
| -rwxr-xr-x | sd/source/ui/annotations/annotationwindow.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index a4642bb68096..0db12f3ceee1 100755 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -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 @@ -76,7 +76,7 @@ #include <vcl/button.hxx> #include <vcl/svapp.hxx> #include <vcl/gradient.hxx> -#include <vcl/salbtype.hxx> // FRound +#include <vcl/salbtype.hxx> // FRound #include <vcl/cursor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -101,12 +101,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::office; using namespace ::com::sun::star::text; -#define METABUTTON_WIDTH 16 -#define METABUTTON_HEIGHT 18 -#define METABUTTON_AREA_WIDTH 30 -#define POSTIT_META_HEIGHT (sal_Int32) 30 +#define METABUTTON_WIDTH 16 +#define METABUTTON_HEIGHT 18 +#define METABUTTON_AREA_WIDTH 30 +#define POSTIT_META_HEIGHT (sal_Int32) 30 -#define EMPTYSTRING rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) +#define EMPTYSTRING rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) namespace sd { @@ -116,9 +116,9 @@ extern com::sun::star::util::DateTime getCurrentDateTime(); Color ColorFromAlphaColor(UINT8 aTransparency, Color &aFront, Color &aBack ) { - return Color((UINT8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); + return Color((UINT8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), + (UINT8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), + (UINT8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); } /************ AnnotationTextWindow **********************************/ @@ -323,8 +323,8 @@ void AnnotationWindow::InitControls() mpMeta->AlwaysDisableInput(true); mpMeta->SetCallHandlersOnInputDisabled(true); -// mpMeta->AddEventListener( LINK( mpPostItTxt, PostItTxt, WindowEventListener ) ); -// AddEventListener( LINK( mpTextWindow, PostItTxt, WindowEventListener ) ); +// mpMeta->AddEventListener( LINK( mpPostItTxt, PostItTxt, WindowEventListener ) ); +// AddEventListener( LINK( mpTextWindow, PostItTxt, WindowEventListener ) ); // we should leave this setting alone, but for this we need a better layout algo // with variable meta size height @@ -352,9 +352,9 @@ void AnnotationWindow::InitControls() mpTextWindow->SetOutlinerView(mpOutlinerView); mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) ); -// SfxItemSet item(DocShell()->GetPool()); -// item.Put(SvxFontHeightItem(352,100,EE_CHAR_FONTHEIGHT)); -// mpOutlinerView->SetAttribs(item); +// SfxItemSet item(DocShell()->GetPool()); +// item.Put(SvxFontHeightItem(352,100,EE_CHAR_FONTHEIGHT)); +// mpOutlinerView->SetAttribs(item); // TODO: ?? EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; @@ -366,7 +366,7 @@ void AnnotationWindow::InitControls() mpVScrollbar->EnableRTL( false ); mpVScrollbar->SetScrollHdl(LINK(this, AnnotationWindow, ScrollHdl)); mpVScrollbar->EnableDrag(); -// mpVScrollbar->AddEventListener( LINK( this, AnnotationWindow, WindowEventListener ) ); +// mpVScrollbar->AddEventListener( LINK( this, AnnotationWindow, WindowEventListener ) ); ULONG nCntrl = mpOutliner->GetControlWord(); nCntrl |= EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL | EE_CNTRL_NOCOLORS; @@ -381,7 +381,7 @@ void AnnotationWindow::InitControls() nCntrl &= ~EE_CNTRL_ONLINESPELLING; */ mpOutliner->SetControlWord(nCntrl); -// mpOutliner->SetFlatMode( TRUE ); +// mpOutliner->SetFlatMode( TRUE ); Engine()->SetModifyHdl( Link() ); Engine()->EnableUndo( FALSE ); @@ -427,14 +427,14 @@ void AnnotationWindow::Rescale() void AnnotationWindow::DoResize() { - unsigned long aWidth = GetSizePixel().Width(); - long aHeight = GetSizePixel().Height() - POSTIT_META_HEIGHT; + unsigned long aWidth = GetSizePixel().Width(); + long aHeight = GetSizePixel().Height() - POSTIT_META_HEIGHT; mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; - long aTextHeight = LogicToPixel( mpOutliner->CalcTextSize()).Height(); + long aTextHeight = LogicToPixel( mpOutliner->CalcTextSize()).Height(); if( aTextHeight > aHeight ) - { // we need vertical scrollbars and have to reduce the width + { // we need vertical scrollbars and have to reduce the width aWidth -= GetScrollbarWidth(); mpVScrollbar->Show(); } @@ -453,7 +453,7 @@ void AnnotationWindow::DoResize() mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); if (!mpVScrollbar->IsVisible()) - { // if we do not have a scrollbar anymore, we want to see the complete text + { // if we do not have a scrollbar anymore, we want to see the complete text mpOutlinerView->SetVisArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); } mpVScrollbar->SetPosSizePixel( 0 + aWidth, 0, GetScrollbarWidth(), aHeight ); @@ -551,7 +551,7 @@ IMPL_LINK(AnnotationWindow, ModifyHdl, void*, EMPTYARG) sal_Int32 AnnotationWindow::GetScrollbarWidth() { return 16; -// return mpView->GetWrtShell().GetViewOptions()->GetZoom() / 10; +// return mpView->GetWrtShell().GetViewOptions()->GetZoom() / 10; } SvxLanguageItem AnnotationWindow::GetLanguage(void) |