summaryrefslogtreecommitdiff
path: root/vcl/source/edit
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-02 16:45:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-02 16:54:18 +0300
commit50bf123ddbeb457b89636621a99c971834adf3ab (patch)
treeb7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/source/edit
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/source/edit')
-rw-r--r--vcl/source/edit/textdat2.hxx11
-rw-r--r--vcl/source/edit/textdata.cxx6
-rw-r--r--vcl/source/edit/textdoc.cxx2
-rw-r--r--vcl/source/edit/textdoc.hxx2
-rw-r--r--vcl/source/edit/texteng.cxx9
-rw-r--r--vcl/source/edit/textund2.hxx6
-rw-r--r--vcl/source/edit/textundo.cxx3
-rw-r--r--vcl/source/edit/textview.cxx11
-rw-r--r--vcl/source/edit/txtattr.cxx6
-rw-r--r--vcl/source/edit/vclmedit.cxx5
-rw-r--r--vcl/source/edit/xtextedt.cxx4
11 files changed, 0 insertions, 65 deletions
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 05375c091c42..c9b3b77a0be5 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -77,8 +77,6 @@ public:
bool HasValidSize() const { return nWidth != (-1); }
};
-
-
typedef std::vector<TETextPortion*> TextPortionArray;
class TETextPortionList : public TextPortionArray
@@ -186,8 +184,6 @@ inline bool TextLine::operator != ( const TextLine& rLine ) const
return !( *this == rLine );
}
-
-
class TEParaPortion
{
private:
@@ -197,21 +193,18 @@ private:
TETextPortionList maTextPortions;
std::vector<TEWritingDirectionInfo> maWritingDirectionInfos;
-
sal_uInt16 mnInvalidPosStart;
short mnInvalidDiff;
bool mbInvalid;
bool mbSimple; // nur lineares Tippen
-
TEParaPortion( const TEParaPortion& ) {;}
public:
TEParaPortion( TextNode* pNode );
~TEParaPortion();
-
bool IsInvalid() const { return mbInvalid; }
bool IsSimpleInvalid() const { return mbSimple; }
void SetNotSimpleInvalid() { mbSimple = false; }
@@ -228,12 +221,10 @@ public:
TETextPortionList& GetTextPortions() { return maTextPortions; }
std::vector<TEWritingDirectionInfo>& GetWritingDirectionInfos() { return maWritingDirectionInfos; }
-
sal_uInt16 GetLineNumber( sal_uInt16 nIndex, bool bInclEnd );
void CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine );
};
-
class TEParaPortions : public ToolsList<TEParaPortion*>
{
public:
@@ -242,7 +233,6 @@ public:
void Reset();
};
-
class TextSelFunctionSet: public FunctionSet
{
private:
@@ -264,7 +254,6 @@ public:
virtual void DestroyAnchor() SAL_OVERRIDE;
};
-
class IdleFormatter : public Timer
{
private:
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index 892ffc1f4dba..f375525e7d4a 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/textdata.hxx>
#include <textdat2.hxx>
#include <tools/debug.hxx>
-
TextSelection::TextSelection()
{
}
@@ -48,7 +46,6 @@ void TextSelection::Justify()
}
}
-
TETextPortionList::TETextPortionList()
{
}
@@ -95,7 +92,6 @@ sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPor
return ( size() - 1 );
}
-
TEParaPortion::TEParaPortion( TextNode* pN )
{
mpNode = pN;
@@ -181,7 +177,6 @@ sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16 nChar, bool bInclEnd )
return ( maLines.size() - 1 );
}
-
void TEParaPortion::CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine )
{
sal_uInt16 nLines = maLines.size();
@@ -315,5 +310,4 @@ void TEIMEInfos::DestroyAttribs()
nLen = 0;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 698e521c32b5..e96dacde26fb 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -63,7 +63,6 @@ void TextCharAttribList::Clear( bool bDestroyAttribs )
TextCharAttribs::clear();
}
-
void TextCharAttribList::InsertAttrib( TextCharAttrib* pAttrib )
{
if ( pAttrib->IsEmpty() )
@@ -485,7 +484,6 @@ OUString TextDoc::GetText( sal_uLong nPara ) const
return aText;
}
-
sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel ) const
{
sal_uLong nLen = 0;
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index 06623ce218dd..1f42c3a0f7c8 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -66,7 +66,6 @@ public:
bool HasBoundingAttrib( sal_uInt16 nBound );
};
-
class TextNode
{
private:
@@ -81,7 +80,6 @@ protected:
public:
TextNode( const OUString& rText );
-
const OUString& GetText() const { return maText; }
const TextCharAttribList& GetCharAttribs() const { return maCharAttribs; }
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 74fb8bcf045a..c19f5df28648 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -63,7 +63,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::rtl;
-
TextEngine::TextEngine()
{
mpDoc = 0;
@@ -479,7 +478,6 @@ void TextEngine::SetText( const OUString& rText )
DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), "SetText: Undo!" );
}
-
void TextEngine::CursorMoved( sal_uLong nNode )
{
// delete empty attribute; but only if paragraph is not empty!
@@ -749,7 +747,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
// at this point now we will insert the character 'normally' some lines below...
}
-
if ( IsUndoEnabled() && !IsInUndo() )
{
TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) );
@@ -772,7 +769,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
return aPaM;
}
-
TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const OUString& rStr )
{
UndoActionStart();
@@ -1153,7 +1149,6 @@ sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nX
return nCurIndex;
}
-
sal_uLong TextEngine::GetTextHeight() const
{
DBG_ASSERT( GetUpdateMode(), "GetTextHeight: GetUpdateMode()" );
@@ -1479,7 +1474,6 @@ void TextEngine::FormatAndUpdate( TextView* pCurView )
}
}
-
void TextEngine::IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts )
{
mpIdleFormatter->DoIdleFormat( pCurView, nMaxTimerRestarts );
@@ -2746,7 +2740,6 @@ void TextEngine::SetTextAlign( TxtAlign eAlign )
}
}
-
void TextEngine::ValidateSelection( TextSelection& rSel ) const
{
ValidatePaM( rSel.GetStart() );
@@ -2767,7 +2760,6 @@ void TextEngine::ValidatePaM( TextPaM& rPaM ) const
rPaM.GetIndex() = nMaxIndex;
}
-
// adjust State & Selection
void TextEngine::ImpParagraphInserted( sal_uLong nPara )
@@ -2951,7 +2943,6 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara )
const UBiDiLevel nBidiLevel = IsRightToLeft() ? 1 /*RTL*/ : 0 /*LTR*/;
OUString aText( pParaPortion->GetNode()->GetText() );
-
// Bidi functions from icu 2.0
UErrorCode nError = U_ZERO_ERROR;
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 8a5a917dd3a4..b469a3bad618 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -22,7 +22,6 @@
#include "textundo.hxx"
#include <vcl/textdata.hxx>
-
class TextUndoDelPara : public TextUndo
{
private:
@@ -41,7 +40,6 @@ public:
virtual OUString GetComment () const SAL_OVERRIDE;
};
-
class TextUndoConnectParas : public TextUndo
{
private:
@@ -59,7 +57,6 @@ public:
virtual OUString GetComment () const SAL_OVERRIDE;
};
-
class TextUndoSplitPara : public TextUndo
{
private:
@@ -77,7 +74,6 @@ public:
virtual OUString GetComment () const SAL_OVERRIDE;
};
-
class TextUndoInsertChars : public TextUndo
{
private:
@@ -96,7 +92,6 @@ public:
virtual OUString GetComment () const SAL_OVERRIDE;
};
-
class TextUndoRemoveChars : public TextUndo
{
private:
@@ -113,7 +108,6 @@ public:
virtual OUString GetComment () const SAL_OVERRIDE;
};
-
class TextUndoSetAttribs: public TextUndo
{
private:
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 6cd4f339d642..59781e1d585d 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -36,7 +36,6 @@ TYPEINIT1( TextUndoSplitPara, TextUndo );
TYPEINIT1( TextUndoInsertChars, TextUndo );
TYPEINIT1( TextUndoRemoveChars, TextUndo );
-
namespace
{
@@ -65,7 +64,6 @@ void Shorten (OUString& rString)
} // namespace
-
TextUndoManager::TextUndoManager( TextEngine* p )
{
mpTextEngine = p;
@@ -96,7 +94,6 @@ bool TextUndoManager::Redo()
if ( GetRedoActionCount() == 0 )
return false;
-
UndoRedoStart();
mpTextEngine->SetIsInUndo( true );
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 6c4f039397ab..c3593f8e8d9e 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -51,12 +51,10 @@
#include <vcl/edit.hxx>
-
#include <sot/exchange.hxx>
#include <osl/mutex.hxx>
-
using namespace ::com::sun::star;
class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable,
@@ -908,7 +906,6 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent )
}
}
-
void TextView::MouseMove( const MouseEvent& rMouseEvent )
{
mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW;
@@ -1412,7 +1409,6 @@ TextPaM TextView::CursorRight( const TextPaM& rPaM, sal_uInt16 nCharacterIterato
return aPaM;
}
-
TextPaM TextView::CursorWordLeft( const TextPaM& rPaM )
{
TextPaM aPaM( rPaM );
@@ -1435,7 +1431,6 @@ TextPaM TextView::CursorWordLeft( const TextPaM& rPaM )
return aPaM;
}
-
TextPaM TextView::CursorWordRight( const TextPaM& rPaM )
{
TextPaM aPaM( rPaM );
@@ -1522,8 +1517,6 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode )
return mpImpl->mpTextEngine->ImpDeleteText( TextSelection( aStartPaM, aEndPaM ) );
}
-
-
TextPaM TextView::CursorUp( const TextPaM& rPaM )
{
TextPaM aPaM( rPaM );
@@ -1705,7 +1698,6 @@ void TextView::ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bSpec
if ( !mpImpl->mpTextEngine->IsFormatted() )
mpImpl->mpTextEngine->FormatAndUpdate( this );
-
TextPaM aPaM( mpImpl->maSelection.GetEnd() );
Rectangle aEditCursor = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM, bSpecial );
@@ -2003,7 +1995,6 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd:
if ( mpImpl->mpTextEngine->HasAttrib( TEXTATTR_HYPERLINK ) ) // then also as HTML
mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, true );
-
/*
// D&D of a Hyperlink
// TODO: Better would be to store MBDownPaM in MBDown,
@@ -2270,8 +2261,6 @@ sal_Int32 TextView::GetLineNumberOfCursorInSelection() const
return nLineNo;
}
-
-
// (+) class TextSelFunctionSet
TextSelFunctionSet::TextSelFunctionSet( TextView* pView )
diff --git a/vcl/source/edit/txtattr.cxx b/vcl/source/edit/txtattr.cxx
index a9fe2df06957..c7d0c592a44d 100644
--- a/vcl/source/edit/txtattr.cxx
+++ b/vcl/source/edit/txtattr.cxx
@@ -17,13 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/txtattr.hxx>
#include <vcl/font.hxx>
-
-
-
TextAttrib::~TextAttrib()
{
}
@@ -33,7 +29,6 @@ bool TextAttrib::operator==( const TextAttrib& rAttr ) const
return mnWhich == rAttr.mnWhich;
}
-
TextAttribFontColor::TextAttribFontColor( const Color& rColor )
: TextAttrib( TEXTATTR_FONTCOLOR ), maColor( rColor )
{
@@ -94,7 +89,6 @@ bool TextAttribFontWeight::operator==( const TextAttrib& rAttr ) const
( meWeight == ((const TextAttribFontWeight&)rAttr).meWeight ) );
}
-
TextAttribHyperLink::TextAttribHyperLink( const TextAttribHyperLink& rAttr )
: TextAttrib( rAttr ), maURL( rAttr.maURL ), maDescription( rAttr.maDescription )
{
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 117082c1b6fd..4e1deac8a0bb 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -34,7 +34,6 @@
#include <vcl/settings.hxx>
#include <boost/scoped_ptr.hpp>
-
class TextWindow : public Window
{
private:
@@ -79,7 +78,6 @@ public:
void SetTextSelectable( bool bTextSelectable ) { mbTextSelectable = bTextSelectable; }
};
-
class ImpVclMEdit : public SfxListener
{
private:
@@ -712,7 +710,6 @@ bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt )
return bDone;
}
-
TextWindow::TextWindow( Window* pParent ) : Window( pParent )
{
mbInMBDown = false;
@@ -1001,7 +998,6 @@ WinBits VclMultiLineEdit::ImplInitStyle( WinBits nStyle )
return nStyle;
}
-
void VclMultiLineEdit::ImplInitSettings( bool /*bFont*/, bool /*bForeground*/, bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -1522,7 +1518,6 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
return nDone || Edit::PreNotify( rNEvt );
}
-
// Internals for derived classes, e.g. TextComponent
ExtTextEngine* VclMultiLineEdit::GetTextEngine() const
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index 04555e68acf5..6f63ccecb9a0 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/xtextedt.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -27,7 +26,6 @@
using namespace ::com::sun::star;
-
ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]"))
{
}
@@ -222,8 +220,6 @@ bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea
return bFound;
}
-
-
// class ExtTextView
ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow )