[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Thu Sep 15 21:40:26 PDT 2011
binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx | 3
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 6
binfilter/bf_svx/source/editeng/svx_impedit4.cxx | 58 --
binfilter/bf_svx/source/editeng/svx_impedit5.cxx | 36 -
binfilter/bf_svx/source/editeng/svx_svxacorr.cxx | 247 ---------
binfilter/bf_svx/source/editeng/svx_txtrange.cxx | 21
binfilter/bf_svx/source/editeng/svx_unolingu.cxx | 262 ----------
binfilter/bf_svx/source/engine3d/svx_cube3d.cxx | 20
binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx | 22
binfilter/bf_svx/source/engine3d/svx_float3d.cxx | 20
binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx | 23
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 19
binfilter/bf_svx/source/engine3d/svx_poly3d.cxx | 3
binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx | 23
binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx | 49 -
binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx | 28 -
binfilter/bf_svx/source/form/svx_ParseContext.cxx | 35 -
binfilter/bf_svx/source/form/svx_fmdpage.cxx | 9
binfilter/bf_svx/source/form/svx_fmmodel.cxx | 56 --
binfilter/bf_svx/source/form/svx_fmobj.cxx | 12
binfilter/bf_svx/source/form/svx_fmobjfac.cxx | 2
binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx | 65 --
binfilter/bf_svx/source/inc/sqlparserclient.hxx | 2
binfilter/bf_svx/source/items/svx_algitem.cxx | 28 -
binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx | 34 -
binfilter/bf_svx/source/unoedit/svx_UnoForbiddenCharsTable.cxx | 3
binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx | 49 -
binfilter/inc/bf_svx/ParseContext.hxx | 4
binfilter/inc/bf_svx/algitem.hxx | 2
binfilter/inc/bf_svx/cube3d.hxx | 1
binfilter/inc/bf_svx/extrud3d.hxx | 12
binfilter/inc/bf_svx/fmmodel.hxx | 1
binfilter/inc/bf_svx/forbiddencharacterstable.hxx | 1
binfilter/inc/bf_svx/lathe3d.hxx | 18
binfilter/inc/bf_svx/obj3d.hxx | 2
binfilter/inc/bf_svx/polygn3d.hxx | 1
binfilter/inc/bf_svx/polysc3d.hxx | 7
binfilter/inc/bf_svx/sphere3d.hxx | 4
38 files changed, 120 insertions(+), 1068 deletions(-)
New commits:
commit 231519e5949a5d77e402e5751186bb2e74977627
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Sep 15 20:27:15 2011 -0700
More cleanup of DBG_BF_ASSERT() from svx classes
diff --git a/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx b/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx
index 2740672..a385b69 100644
--- a/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx
@@ -80,9 +80,6 @@ const ::com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::
/*N*/ pInf->aForbiddenChars = rForbiddenChars;
/*N*/ }
-/*N*/ void SvxForbiddenCharactersTable::ClearForbiddenCharacters( USHORT )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
index 27e7ddf..dd715af 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
@@ -1612,8 +1612,10 @@ using namespace ::com::sun::star;
/*N*/ nCurIndex = GetChar( pPortion, pLine, aDocPos.X(), bSmart );
/*N*/ aPaM.SetIndex( nCurIndex );
/*N*/
-/*N*/ if ( nCurIndex && ( nCurIndex == pLine->GetEnd() ) &&
-/*N*/ ( pLine != pPortion->GetLines().GetObject( pPortion->GetLines().Count()-1) ) )
+/*N*/ if ( nCurIndex
+ && ( nCurIndex == pLine->GetEnd() )
+ && ( pLine != pPortion->GetLines().GetObject( pPortion->GetLines().Count()-1) )
+ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
index 3b4f5ec..bad3b0c 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx
@@ -53,27 +53,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
-
-
-
-
-
-
-#ifndef SVX_LIGHT
-#endif
-
-
-
-
-
-#ifndef SVX_LIGHT
-#endif
-
-
-
-
-
-
/*N*/ EditTextObject* ImpEditEngine::CreateTextObject()
/*N*/ {
/*N*/ EditSelection aCompleteSelection;
@@ -232,18 +211,6 @@ using namespace ::com::sun::star::linguistic2;
/*?*/
/*?*/ // Die Zeilen
/*?*/ nCount = pParaPortion->GetLines().Count();
-/*?*/ for ( n = 0; n < nCount; n++ )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ #ifdef DBG_UTIL
-/*?*/ USHORT nTest, nTPLen = 0, nTxtLen = 0;
-/*?*/ for ( nTest = pParaPortion->GetTextPortions().Count(); nTest; )
-/*?*/ nTPLen += pParaPortion->GetTextPortions().GetObject( --nTest )->GetLen();
-/*?*/ for ( nTest = pParaPortion->GetLines().Count(); nTest; )
-/*?*/ nTxtLen += pParaPortion->GetLines().GetObject( --nTest )->GetLen();
-/*?*/ DBG_ASSERT( ( nTPLen == pParaPortion->GetNode()->Len() ) && ( nTxtLen == pParaPortion->GetNode()->Len() ), "CreateBinTextObject: ParaPortion not completely formatted!" );
-/*?*/ #endif
/*?*/ }
/*N*/ }
/*N*/ return pTxtObj;
@@ -396,9 +363,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ }
/*N*/ if ( !bConvertItems )
/*N*/ SetParaAttribs( aEditDoc.GetPos( aPaM.GetNode() ), pC->GetParaAttribs() );
-/*N*/ else
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ if ( bNewContent && bUsePortionInfo )
/*N*/ {
@@ -424,18 +388,6 @@ using namespace ::com::sun::star::linguistic2;
/*?*/ // Die Zeilen
/*?*/ pParaPortion->GetLines().Reset();
/*?*/ nCount = pXP->aLines.Count();
-/*?*/ for ( sal_uInt16 m = 0; m < nCount; m++ )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ #ifdef DBG_UTIL
-/*?*/ USHORT nTest, nTPLen = 0, nTxtLen = 0;
-/*?*/ for ( nTest = pParaPortion->GetTextPortions().Count(); nTest; )
-/*?*/ nTPLen += pParaPortion->GetTextPortions().GetObject( --nTest )->GetLen();
-/*?*/ for ( nTest = pParaPortion->GetLines().Count(); nTest; )
-/*?*/ nTxtLen += pParaPortion->GetLines().GetObject( --nTest )->GetLen();
-/*?*/ DBG_ASSERT( ( nTPLen == pParaPortion->GetNode()->Len() ) && ( nTxtLen == pParaPortion->GetNode()->Len() ), "InsertBinTextObject: ParaPortion not completely formatted!" );
-/*?*/ #endif
/*N*/ }
/*N*/ }
/*N*/ if ( !bParaAttribs ) // DefFont wird bei FastInsertParagraph nicht berechnet
@@ -482,16 +434,6 @@ using namespace ::com::sun::star::linguistic2;
-
-
-
-
-
-
-
-
-
-
/*N*/ void ImpEditEngine::SetAsianCompressionMode( USHORT n )
/*N*/ {
/*N*/ if ( n != nAsianCompressionMode )
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit5.cxx b/binfilter/bf_svx/source/editeng/svx_impedit5.cxx
index dd708ad..72145cd 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit5.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit5.cxx
@@ -46,13 +46,7 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( pStylePool != pSPool )
/*N*/ {
-/*N*/ // if ( pStylePool )
-/*N*/ // EndListening( *pStylePool, TRUE );
-/*N*/
/*N*/ pStylePool = pSPool;
-/*N*/
-/*N*/ // if ( pStylePool )
-/*N*/ // StartListening( *pStylePool, TRUE );
/*N*/ }
/*N*/ }
@@ -129,10 +123,6 @@ namespace binfilter {
/*N*/ {
/*N*/ #ifndef SVX_LIGHT
/*N*/ DBG_ASSERT( !IsInUndo(), "InsertUndo im Undomodus!" );
-/*N*/ if ( pUndoMarkSelection )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ GetUndoManager().AddUndoAction( pUndo, bTryMerge );
/*N*/ #endif
/*N*/ }
@@ -165,12 +155,6 @@ namespace binfilter {
/*N*/
/*N*/ aSel.Adjust( aEditDoc );
/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ // if ( ( aSel.Min().GetNode() == aSel.Max().GetNode() ) && ( bOnlyHardAttrib == EditEngineAttribs_All ) )
-/*N*/ // return GetAttribs( aEditDoc.GetPos( aSel.Min().GetNode() ), aSel.Min().GetIndex(), aSel.Max().GetIndex(), GETATTRIBS_ALL );
-/*N*/ #endif
-/*N*/
-/*N*/
/*N*/ SfxItemSet aCurSet( GetEmptyItemSet() );
/*N*/
/*N*/ USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
@@ -236,7 +220,6 @@ namespace binfilter {
/*N*/ // => Lieber nicht invalidieren, UMSTELLEN!
/*N*/ // Besser waere, Absatzweise ein ItemSet zu fuellen
/*N*/ // und dieses mit dem gesmten vergleichen.
-/*N*/ // aCurSet.InvalidateItem( nWhich );
/*N*/ if ( nWhich <= EE_PARA_END )
/*?*/ aCurSet.InvalidateItem( nWhich );
/*N*/ }
@@ -384,15 +367,6 @@ namespace binfilter {
/*N*/ nEndPos = aSel.Max().GetIndex();
/*N*/
/*N*/ // ueber die Items iterieren...
-/*N*/ #ifdef EDITDEBUG
-/*N*/ // FILE* fp = fopen( "d:\\debug.log", "a" );
-/*N*/ // if ( fp )
-/*N*/ // {
-/*N*/ // fprintf( fp, "\n \n=> Zeichen-Attribute: Absatz %i, %i-%i\n", nNode, nStartPos, nEndPos );
-/*N*/ // DbgOutItemSet( fp, rSet, TRUE, FALSE );
-/*N*/ // fclose( fp );
-/*N*/ // }
-/*N*/ #endif
/*N*/
/*N*/ for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
/*N*/ {
@@ -483,16 +457,6 @@ namespace binfilter {
/*N*/ if ( !pNode )
/*N*/ return;
/*N*/
-/*N*/ #ifdef EDITDEBUG
-/*N*/ // FILE* fp = fopen( "d:\\debug.log", "a" );
-/*N*/ // if ( fp )
-/*N*/ // {
-/*N*/ // fprintf( fp, "\n \n=> Absatz-Attribute: Absatz %i\n", nPara );
-/*N*/ // DbgOutItemSet( fp, rSet, TRUE, FALSE );
-/*N*/ // fclose( fp );
-/*N*/ // }
-/*N*/ #endif
-/*N*/
/*N*/ if ( !( pNode->GetContentAttribs().GetItems() == rSet ) )
/*N*/ {
/*N*/ #ifndef SVX_LIGHT
diff --git a/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx b/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx
deleted file mode 100644
index a6dd548..0000000
--- a/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx
+++ /dev/null
@@ -1,247 +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.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#define ITEMID_UNDERLINE 0
-#define ITEMID_WEIGHT 0
-#define ITEMID_ESCAPEMENT 0
-#define ITEMID_CHARSETCOLOR 0
-#define ITEMID_COLOR 0
-
-#include <vcl/svapp.hxx>
-#include <bf_sfx2/docfile.hxx>
-// fuer die Sort-String-Arrays aus dem SVMEM.HXX
-#define _SVSTDARR_STRINGSISORTDTOR
-#define _SVSTDARR_STRINGSDTOR
-
-#include <unotools/charclass.hxx>
-#include <com/sun/star/i18n/UnicodeType.hdl>
-
-#include <svxids.hrc>
-
-#include "escpitem.hxx"
-#include "svxacorr.hxx"
-
-#include <helpid.hrc>
-
-#include <unotools/streamwrap.hxx>
-#include <bf_xmloff/xmltoken.hxx>
-namespace binfilter {
-
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star;
-using namespace ::binfilter::xmloff::token;
-using namespace ::rtl;
-using namespace ::utl;
-
-const int C_NONE = 0x00;
-const int C_FULL_STOP = 0x01;
-const int C_EXCLAMATION_MARK = 0x02;
-const int C_QUESTION_MARK = 0x04;
-
-static const sal_Char pImplWrdStt_ExcptLstStr[] = "WordExceptList";
-static const sal_Char pImplCplStt_ExcptLstStr[] = "SentenceExceptList";
-static const sal_Char pImplAutocorr_ListStr[] = "DocumentList";
-static const sal_Char pXMLImplWrdStt_ExcptLstStr[] = "WordExceptList.xml";
-static const sal_Char pXMLImplCplStt_ExcptLstStr[] = "SentenceExceptList.xml";
-static const sal_Char pXMLImplAutocorr_ListStr[] = "DocumentList.xml";
-
-static const sal_Char
- /* auch bei diesen Anfaengen - Klammern auf und alle Arten von Anf.Zei. */
- sImplSttSkipChars[] = "\"\'([{\x83\x84\x89\x91\x92\x93\x94",
- /* auch bei diesen Ende - Klammern auf und alle Arten von Anf.Zei. */
- sImplEndSkipChars[] = "\"\')]}\x83\x84\x89\x91\x92\x93\x94";
-
-// diese Zeichen sind in Worten erlaubt: (fuer FnCptlSttSntnc)
-static const sal_Char sImplWordChars[] = "-'";
-
-void EncryptBlockName_Imp( String& rName );
-void DecryptBlockName_Imp( String& rName );
-
-
-// FileVersions Nummern fuer die Ersetzungs-/Ausnahmelisten getrennt
-#define WORDLIST_VERSION_358 1
-#define EXEPTLIST_VERSION_358 0
-
-
-
-/*N*/ typedef SvxAutoCorrectLanguageLists* SvxAutoCorrectLanguageListsPtr;
-/*N*/ DECLARE_TABLE( SvxAutoCorrLanguageTable_Impl, SvxAutoCorrectLanguageListsPtr)
-
-/*N*/ DECLARE_TABLE( SvxAutoCorrLastFileAskTable_Impl, long )
- // wird nach dem austauschen der Zeichen von den Funktionen
- // - FnCptlSttWrd
- // - FnCptlSttSntnc
- // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten
- // aufgenommen werden.
-
-/*N*/ static USHORT GetAppLang()
-/*N*/ {
-/*N*/ return Application::GetSettings().GetLanguage();
-/*N*/ }
-
-/*N*/ void lcl_ClearTable(SvxAutoCorrLanguageTable_Impl& rLangTable)
-/*N*/ {
-/*N*/ SvxAutoCorrectLanguageListsPtr pLists = rLangTable.Last();
-/*N*/ while(pLists)
-/*N*/ {
-/*?*/ delete pLists;
-/*?*/ pLists = rLangTable.Prev();
-/*N*/ }
-/*N*/ rLangTable.Clear();
-/*N*/ }
-
-/*N*/ long SvxAutoCorrect::GetDefaultFlags()
-/*N*/ {
-/*N*/ long nRet = Autocorrect
-/*N*/ | CptlSttSntnc
-/*N*/ | CptlSttWrd
-/*N*/ | ChgFractionSymbol
-/*N*/ | ChgOrdinalNumber
-/*N*/ | ChgToEnEmDash
-/*N*/ | ChgWeightUnderl
-/*N*/ | SetINetAttr
-/*N*/ | ChgQuotes
-/*N*/ | SaveWordCplSttLst
-/*N*/ | SaveWordWrdSttLst;
-/*N*/ LanguageType eLang = GetAppLang();
-/*N*/ switch( eLang )
-/*N*/ {
-/*N*/ case LANGUAGE_ENGLISH:
-/*N*/ case LANGUAGE_ENGLISH_US:
-/*N*/ case LANGUAGE_ENGLISH_UK:
-/*N*/ case LANGUAGE_ENGLISH_AUS:
-/*N*/ case LANGUAGE_ENGLISH_CAN:
-/*N*/ case LANGUAGE_ENGLISH_NZ:
-/*N*/ case LANGUAGE_ENGLISH_EIRE:
-/*N*/ case LANGUAGE_ENGLISH_SAFRICA:
-/*N*/ case LANGUAGE_ENGLISH_JAMAICA:
-/*N*/ case LANGUAGE_ENGLISH_CARRIBEAN:
-/*N*/ nRet &= ~(ChgQuotes|ChgSglQuotes);
-/*N*/ break;
-/*N*/ }
-/*N*/ return nRet;
-/*N*/ }
-
-/*N*/ SvxAutoCorrect::SvxAutoCorrect( const String& rShareAutocorrFile,
-/*N*/ const String& rUserAutocorrFile )
-/*N*/ : sShareAutoCorrFile( rShareAutocorrFile ),
-/*N*/ sUserAutoCorrFile( rUserAutocorrFile ),
-/*N*/ cStartSQuote( 0 ), cEndSQuote( 0 ), cStartDQuote( 0 ), cEndDQuote( 0 ),
-/*N*/ pLangTable( new SvxAutoCorrLanguageTable_Impl ),
-/*N*/ pLastFileTable( new SvxAutoCorrLastFileAskTable_Impl ),
-/*N*/ pCharClass( 0 )
-/*N*/ {
-/*N*/ nFlags = SvxAutoCorrect::GetDefaultFlags();
-/*N*/
-/*N*/ c1Div2 = ByteString_ConvertToUnicode( '\xBD', RTL_TEXTENCODING_MS_1252 );
-/*N*/ c1Div4 = ByteString_ConvertToUnicode( '\xBC', RTL_TEXTENCODING_MS_1252 );
-/*N*/ c3Div4 = ByteString_ConvertToUnicode( '\xBE', RTL_TEXTENCODING_MS_1252 );
-/*N*/ cEmDash = ByteString_ConvertToUnicode( '\x97', RTL_TEXTENCODING_MS_1252 );
-/*N*/ cEnDash = ByteString_ConvertToUnicode( '\x96', RTL_TEXTENCODING_MS_1252 );
-/*N*/ }
-
-/*N*/ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
-/*N*/ : nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad)),
-/*N*/ aSwFlags( rCpy.aSwFlags ),
-/* Die Sprachentabelle wird neu aufgebaut, da sie im Dtor von rCpy abgeraeumt wird!
- */
-/*N*/ sShareAutoCorrFile( rCpy.sShareAutoCorrFile ),
-/*N*/ sUserAutoCorrFile( rCpy.sUserAutoCorrFile ),
-/*N*/ cStartSQuote( rCpy.cStartSQuote ), cEndSQuote( rCpy.cEndSQuote ),
-/*N*/ cStartDQuote( rCpy.cStartDQuote ), cEndDQuote( rCpy.cEndDQuote ),
-/*N*/ c1Div2( rCpy.c1Div2 ), c1Div4( rCpy.c1Div4 ), c3Div4( rCpy.c3Div4 ),
-/*N*/ cEmDash( rCpy.cEmDash ), cEnDash( rCpy.cEnDash ),
-/*N*/ pLangTable( new SvxAutoCorrLanguageTable_Impl ),
-/*N*/ pLastFileTable( new SvxAutoCorrLastFileAskTable_Impl ),
-/*N*/ pCharClass( 0 )
-/*N*/ {
-/*N*/ }
-
-/*N*/ SvxAutoCorrect::~SvxAutoCorrect()
-/*N*/ {
-/*N*/ lcl_ClearTable(*pLangTable);
-/*N*/ delete pLangTable;
-/*N*/ delete pLastFileTable;
-/*N*/ delete pCharClass;
-/*N*/ }
-
-/*N*/ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, BOOL bOn )
-/*N*/ {
-/*N*/ long nOld = nFlags;
-/*N*/ nFlags = bOn ? nFlags | nFlag
-/*N*/ : nFlags & ~nFlag;
-/*N*/
-/*N*/ if( !bOn )
-/*N*/ {
-/*N*/ if( (nOld & CptlSttSntnc) != (nFlags & CptlSttSntnc) )
-/*?*/ nFlags &= ~CplSttLstLoad;
-/*N*/ if( (nOld & CptlSttWrd) != (nFlags & CptlSttWrd) )
-/*?*/ nFlags &= ~WrdSttLstLoad;
-/*N*/ if( (nOld & Autocorrect) != (nFlags & Autocorrect) )
-/*?*/ nFlags &= ~ChgWordLstLoad;
-/*N*/ }
-/*N*/ }
-
- // Zwei Grossbuchstaben am Wort-Anfang ??
-
- // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort
- // in die Datei geschrieben!
-
- // - loesche einen Eintrag
-
- // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen
- // koennen aus der Wortliste herausgeholt werden!)
-
- // - Text mit Attributierung (kann nur der SWG - SWG-Format!)
-
-/* This code is copied from SwXMLTextBlocks::GeneratePackageName */
-
-// suche das oder die Worte in der ErsetzungsTabelle
-
-/*N*/ SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists(
-/*N*/ SvxAutoCorrect& rParent,
-/*N*/ const String& rShareAutoCorrectFile,
-/*N*/ const String& rUserAutoCorrectFile,
-/*N*/ LanguageType eLang)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ SvxAutoCorrectLanguageLists::~SvxAutoCorrectLanguageLists()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
- // - Text mit Attributierung (kann nur der SWG - SWG-Format!)
- // - loesche einen Eintrag
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
index ce3373d..e616ac9 100644
--- a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx
@@ -207,17 +207,6 @@ namespace binfilter {
/*N*/ NotePoint( Cut( nBottom, rLst, rNxt ) );
/*N*/ if( nCut & 2 )
/*N*/ NotePoint( Cut( nTop, rLst, rNxt ) );
-/*N*/ if( rLst.X() != rNxt.X() && rLst.Y() != rNxt.Y() )
-/*N*/ {
-/*N*/ if( nLowDiff && ( ( nCut & 1 ) || nLast == 1 || nNext == 1 ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ if( nUpDiff && ( ( nCut & 2 ) || nLast == 2 || nNext == 2 ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/ }
@@ -300,11 +289,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ // Der erste Punkt des Polygons liegt innerhalb der Zeile.
-/*N*/ if( nLast )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !nLast )
/*N*/ {
/*N*/ if( bMultiple || !nAct )
/*N*/ {
@@ -357,10 +342,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if( !nNext )
/*N*/ NotePoint( A(rNext) );
-/*N*/ else if( nNext & 1 )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ nLast = nNext;
/*N*/ if( ++nIdx == nCount && !IsClosed() )
diff --git a/binfilter/bf_svx/source/editeng/svx_unolingu.cxx b/binfilter/bf_svx/source/editeng/svx_unolingu.cxx
index 8389403..0759308 100644
--- a/binfilter/bf_svx/source/editeng/svx_unolingu.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_unolingu.cxx
@@ -85,227 +85,6 @@ using namespace ::com::sun::star::linguistic2;
///////////////////////////////////////////////////////////////////////////
-// static member initialization
-BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
-
-/*N*/ void SvxLinguConfigUpdate::UpdateAll()
-/*N*/ {
-/*N*/ }
-
-///////////////////////////////////////////////////////////////////////////
-
-
-//! Dummy implementation in order to avoid loading of lingu DLL
-//! when only the XSupportedLocales interface is used.
-//! The dummy accesses the real implementation (and thus loading the DLL)
-//! when "real" work needs to be done only.
-/*N*/ class ThesDummy_Impl :
-/*N*/ public cppu::WeakImplHelper1< XThesaurus >
-/*N*/ {
-/*N*/ Reference< XThesaurus > xThes; // the real one...
-/*N*/ Sequence< Locale > *pLocaleSeq;
-/*N*/
-/*N*/ void GetCfgLocales();
-/*N*/
-/*N*/ void GetThes_Impl();
-/*N*/
-/*N*/ public:
-/*N*/ ThesDummy_Impl() : pLocaleSeq(0) {}
-/*N*/ ~ThesDummy_Impl();
-/*N*/
-/*N*/ // XSupportedLocales
-/*N*/ virtual ::com::sun::star::uno::Sequence<
-/*N*/ ::com::sun::star::lang::Locale > SAL_CALL
-/*N*/ getLocales()
-/*N*/ throw(::com::sun::star::uno::RuntimeException);
-/*N*/ virtual sal_Bool SAL_CALL
-/*N*/ hasLocale( const ::com::sun::star::lang::Locale& rLocale )
-/*N*/ throw(::com::sun::star::uno::RuntimeException);
-/*N*/
-/*N*/ // XThesaurus
-/*N*/ virtual ::com::sun::star::uno::Sequence<
-/*N*/ ::com::sun::star::uno::Reference<
-/*N*/ ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
-/*N*/ queryMeanings( const ::rtl::OUString& rTerm,
-/*N*/ const ::com::sun::star::lang::Locale& rLocale,
-/*N*/ const ::com::sun::star::beans::PropertyValues& rProperties )
-/*N*/ throw(::com::sun::star::lang::IllegalArgumentException,
-/*N*/ ::com::sun::star::uno::RuntimeException);
-/*N*/ };
-
-
-/*N*/ ThesDummy_Impl::~ThesDummy_Impl()
-/*N*/ {
-/*N*/ delete pLocaleSeq;
-/*N*/ }
-
-
-/*N*/ void ThesDummy_Impl::GetCfgLocales()
-/*N*/ {
-/*N*/ if (!pLocaleSeq)
-/*N*/ {
-/*N*/ SvtLinguConfig aCfg;
-/*N*/ String aNode( A2OU( "ServiceManager/ThesaurusList" ) );
-/*N*/ Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) );
-/*N*/ const OUString *pNodeNames = aNodeNames.getConstArray();
-/*N*/ INT32 nLen = aNodeNames.getLength();
-/*N*/ pLocaleSeq = new Sequence< Locale >( nLen );
-/*N*/ Locale *pLocale = pLocaleSeq->getArray();
-/*N*/ for (INT32 i = 0; i < nLen; ++i)
-/*N*/ {
-/*N*/ pLocale[i] = SvxCreateLocale(
-/*N*/ MsLangId::convertIsoStringToLanguage( pNodeNames[i] ) );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void ThesDummy_Impl::GetThes_Impl()
-/*N*/ {
-/*N*/ // update configuration before accessing the service
-/*N*/ if (!SvxLinguConfigUpdate::IsUpdated())
-/*?*/ SvxLinguConfigUpdate::UpdateAll();
-/*N*/
-/*N*/ if (!xThes.is())
-/*N*/ {
-/*N*/ Reference< XLinguServiceManager > xLngSvcMgr( GetLngSvcMgr_Impl() );
-/*N*/ if (xLngSvcMgr.is())
-/*N*/ xThes = xLngSvcMgr->getThesaurus();
-/*N*/
-/*?*/ if (xThes.is())
-/*?*/ {
-/*?*/ // no longer needed...
-/*?*/ delete pLocaleSeq; pLocaleSeq = 0;
-/*?*/ }
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ uno::Sequence< lang::Locale > SAL_CALL
-/*N*/ ThesDummy_Impl::getLocales()
-/*N*/ throw(uno::RuntimeException)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Sequence< lang::Locale > aa; return aa;
-/*N*/ }
-
-
-/*N*/ sal_Bool SAL_CALL
-/*N*/ ThesDummy_Impl::hasLocale( const lang::Locale& rLocale )
-/*N*/ throw(uno::RuntimeException)
-/*N*/ {
-/*N*/ if (SvxLinguConfigUpdate::IsUpdated())
-/*N*/ GetThes_Impl();
-/*N*/ if (xThes.is())
-/*?*/ return xThes->hasLocale( rLocale );
-/*N*/ else if (!pLocaleSeq)
-/*N*/ GetCfgLocales();
-/*N*/ BOOL bFound = FALSE;
-/*N*/ INT32 nLen = pLocaleSeq->getLength();
-/*N*/ const Locale *pLocale = pLocaleSeq->getConstArray();
-/*N*/ const Locale *pEnd = pLocale + nLen;
-/*N*/ for ( ; pLocale < pEnd && !bFound; ++pLocale)
-/*N*/ {
-/*N*/ bFound = pLocale->Language == rLocale.Language &&
-/*N*/ pLocale->Country == rLocale.Country &&
-/*N*/ pLocale->Variant == rLocale.Variant;
-/*N*/ }
-/*N*/ return bFound;
-/*N*/ }
-
-
-/*N*/ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
-/*N*/ ThesDummy_Impl::queryMeanings(
-/*N*/ const ::rtl::OUString& /*rTerm*/,
-/*N*/ const lang::Locale& /*rLocale*/,
-/*N*/ const beans::PropertyValues& /*rProperties*/ )
-/*N*/ throw(lang::IllegalArgumentException,
-/*N*/ uno::RuntimeException)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes;return aRes;
-/*N*/ }
-
-
-///////////////////////////////////////////////////////////////////////////
-
-
-//! Dummy implementation in order to avoid loading of lingu DLL.
-//! The dummy accesses the real implementation (and thus loading the DLL)
-//! when it needs to be done only.
-/*N*/ class SpellDummy_Impl :
-/*N*/ public cppu::WeakImplHelper1< XSpellChecker1 >
-/*N*/ {
-/*N*/ Reference< XSpellChecker1 > xSpell; // the real one...
-/*N*/
-/*N*/ void GetSpell_Impl();
-/*N*/
-/*N*/ public:
-/*N*/
-/*N*/ // XSupportedLanguages (for XSpellChecker1)
-/*N*/ virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
-/*N*/ getLanguages()
-/*N*/ throw(::com::sun::star::uno::RuntimeException);
-/*N*/ virtual sal_Bool SAL_CALL
-/*N*/ hasLanguage( sal_Int16 nLanguage )
-/*N*/ throw(::com::sun::star::uno::RuntimeException);
-/*N*/
-/*N*/ // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language)
-/*N*/ virtual sal_Bool SAL_CALL
-/*N*/ isValid( const ::rtl::OUString& rWord, sal_Int16 nLanguage,
-/*N*/ const ::com::sun::star::beans::PropertyValues& rProperties )
-/*N*/ throw(::com::sun::star::lang::IllegalArgumentException,
-/*N*/ ::com::sun::star::uno::RuntimeException);
-/*N*/ virtual ::com::sun::star::uno::Reference<
-/*N*/ ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL
-/*N*/ spell( const ::rtl::OUString& rWord, sal_Int16 nLanguage,
-/*N*/ const ::com::sun::star::beans::PropertyValues& rProperties )
-/*N*/ throw(::com::sun::star::lang::IllegalArgumentException,
-/*N*/ ::com::sun::star::uno::RuntimeException);
-/*N*/ };
-
-
-/*N*/ void SpellDummy_Impl::GetSpell_Impl()
-/*N*/ { DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-/*N*/ uno::Sequence< sal_Int16 > SAL_CALL
-/*N*/ SpellDummy_Impl::getLanguages()
-/*N*/ throw(uno::RuntimeException)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< sal_Int16 >();
-/*N*/ }
-
-
-/*N*/ sal_Bool SAL_CALL
-/*N*/ SpellDummy_Impl::hasLanguage( sal_Int16 /*nLanguage*/ )
-/*N*/ throw(uno::RuntimeException)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE;
-/*N*/ }
-
-
-/*N*/ sal_Bool SAL_CALL
-/*N*/ SpellDummy_Impl::isValid( const ::rtl::OUString& rWord, sal_Int16 nLanguage,
-/*N*/ const beans::PropertyValues& rProperties )
-/*N*/ throw(lang::IllegalArgumentException,
-/*N*/ uno::RuntimeException)
-/*N*/ {
-/*?*/ GetSpell_Impl();
-/*?*/ BOOL bRes = TRUE;
-/*?*/ if (xSpell.is())
-/*?*/ bRes = xSpell->isValid( rWord, nLanguage, rProperties );
-/*?*/ return bRes;
-/*N*/ }
-
-
-/*N*/ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
-/*N*/ SpellDummy_Impl::spell( const ::rtl::OUString& /*rWord*/, sal_Int16 /*nLanguage*/,
-/*N*/ const beans::PropertyValues& /*rProperties*/ )
-/*N*/ throw(lang::IllegalArgumentException,
-/*N*/ uno::RuntimeException)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Reference< linguistic2::XSpellAlternatives > xRes; return xRes;
-/*N*/ }
-
-
-///////////////////////////////////////////////////////////////////////////
-
-
//! Dummy implementation in order to avoid loading of lingu DLL.
//! The dummy accesses the real implementation (and thus loading the DLL)
//! when it needs to be done only.
@@ -357,10 +136,6 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
/*N*/ void HyphDummy_Impl::GetHyph_Impl()
/*N*/ {
-/*N*/ // update configuration before accessing the service
-/*N*/ if (!SvxLinguConfigUpdate::IsUpdated())
-/*N*/ SvxLinguConfigUpdate::UpdateAll();
-/*N*/
/*N*/ if (!xHyph.is())
/*N*/ {
/*N*/ Reference< XLinguServiceManager > xLngSvcMgr( GetLngSvcMgr_Impl() );
@@ -370,11 +145,12 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
/*N*/ }
-/*N*/ uno::Sequence< lang::Locale > SAL_CALL
-/*N*/ HyphDummy_Impl::getLocales()
-/*N*/ throw(uno::RuntimeException)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< lang::Locale >();
-/*N*/ }
+uno::Sequence< lang::Locale > SAL_CALL HyphDummy_Impl::getLocales()
+ throw(uno::RuntimeException)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return uno::Sequence< lang::Locale >();
+}
/*N*/ sal_Bool SAL_CALL
@@ -561,15 +337,6 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
/*N*/ //! use dummy implementation in order to avoid loading of lingu DLL
/*N*/ xHyph = new HyphDummy_Impl;
/*N*/
-/*
- if (!xLngSvcMgr.is())
- xLngSvcMgr = GetLngSvcMgr_Impl();
-
- if (xLngSvcMgr.is())
- {
- xHyph = xLngSvcMgr->getHyphenator();
- }
-*/
/*N*/ return xHyph;
/*N*/ }
@@ -596,33 +363,16 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE;
///////////////////////////////////////////////////////////////////////////
-
-
-
-
-
//TL:TODO: remove argument or provide SvxGetIgnoreAllList with the same one
-
-
///////////////////////////////////////////////////////////////////////////
-
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
-
-
-///////////////////////////////////////////////////////////////////////////
-
-
-
///////////////////////////////////////////////////////////////////////////
-
//TL:TODO: soll mal den rictigen Rückgabetyp bekommen!
-
-
/*N*/ LanguageType SvxLocaleToLanguage( const Locale& rLocale )
/*N*/ {
/*N*/ // empty Locale -> LANGUAGE_NONE
diff --git a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
index 19a6d78..81fc5b4 100644
--- a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
@@ -271,26 +271,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void E3dCubeObj::SetPosIsCenter(BOOL /*bNew*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-/*************************************************************************
-|*
-|* Get the name of the object (singular)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Get the name of the object (plural)
-|*
-\************************************************************************/
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
index d2d4734..4de0370 100644
--- a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
@@ -269,20 +269,14 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dExtrudeObj::CreateWireframe(Polygon3D& /*rWirePoly*/, const Matrix4D* /*pTf*/,
-/*N*/ E3dDragDetail eDetail)
-/*N*/ {
-/*N*/ if ( eDetail == E3DDETAIL_ALLLINES ||
-/*N*/ (eDetail == E3DDETAIL_DEFAULT && GetDragDetail() == E3DDETAIL_ALLLINES) )
-/*N*/ {
-/*N*/ // Detailliert erzeugen
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // call parent
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+void E3dExtrudeObj::CreateWireframe(
+ Polygon3D& /*rWirePoly*/,
+ const Matrix4D* /*pTf*/,
+ E3dDragDetail /* eDetail */
+)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
/*************************************************************************
|*
diff --git a/binfilter/bf_svx/source/engine3d/svx_float3d.cxx b/binfilter/bf_svx/source/engine3d/svx_float3d.cxx
index 71ea516..d4d9e78 100644
--- a/binfilter/bf_svx/source/engine3d/svx_float3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_float3d.cxx
@@ -39,22 +39,22 @@
#include "float3d.hrc"
namespace binfilter {
-/*N*/ SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN )
-
+SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN )
/*************************************************************************
|*
|* Ableitung vom SfxChildWindow als "Behaelter" fuer Effekte
|*
\************************************************************************/
-/*N*/ Svx3DChildWindow::Svx3DChildWindow( Window* pParent,
-/*N*/ USHORT nId,
-/*N*/ SfxBindings* pBindings,
-/*N*/ SfxChildWinInfo* pInfo ) :
-/*N*/ SfxChildWindow( pParent, nId )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+Svx3DChildWindow::Svx3DChildWindow(
+ Window* pParent,
+ USHORT nId,
+ SfxBindings* pBindings,
+ SfxChildWinInfo* pInfo
+) : SfxChildWindow( pParent, nId )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // CONSTRUCTOR
+}
}
diff --git a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
index 38a8594..ac9ba09 100644
--- a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
@@ -341,21 +341,14 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dLatheObj::CreateWireframe(Polygon3D& /*rWirePoly*/, const Matrix4D* /*pTf*/,
-/*N*/ E3dDragDetail eDetail)
-/*N*/ {
-/*N*/ // Nur selbst erzeugen, wenn alle Linien angezeigt werden sollen
-/*N*/ if ( eDetail == E3DDETAIL_ALLLINES ||
-/*N*/ (eDetail == E3DDETAIL_DEFAULT && GetDragDetail() == E3DDETAIL_ALLLINES) )
-/*N*/ {
-/*N*/ // Detailliert erzeugen
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // call parent
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+void E3dLatheObj::CreateWireframe(
+ Polygon3D& /*rWirePoly*/,
+ const Matrix4D* /*pTf*/,
+ E3dDragDetail /* eDetail */
+)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
/*************************************************************************
|*
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index f6faf3d..9414202 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -139,18 +139,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Aufbrechen, default-Implementierungen
-|*
-\************************************************************************/
-
-
-/*N*/ SdrAttrObj* E3dObject::GetBreakObj()
-/*N*/ {
-/*N*/ return 0L;
-/*N*/ }
-
-/*************************************************************************
-|*
|* SetRectsDirty muss ueber die lokale SdrSubList gehen
|*
\************************************************************************/
@@ -1109,12 +1097,7 @@ namespace binfilter {
/*N*/ E3dScene* pScene = GetScene();
/*N*/ if(pScene)
/*N*/ {
-/*N*/ // Schatten beruecksichtigen
-/*N*/ if(DoDrawShadow())
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
- // Linienbreite beruecksichtigen
+ // Linienbreite beruecksichtigen
/*N*/ INT32 nLineWidth = ((const XLineWidthItem&)(GetItem(XATTR_LINEWIDTH))).GetValue();
/*N*/ if(nLineWidth)
/*N*/ {
diff --git a/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx b/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx
index 8ccfc58..ebd67a9 100644
--- a/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx
@@ -1794,9 +1794,6 @@ typedef ::std::vector< Polygon3D* > Polygon3DList;
/*N*/
/*N*/ if ( !bTruncated )
/*N*/ {
-/*N*/ if ( nAllPointCount > POLY3D_MAXPOINTS )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ rPolyPoly3D.pImpPolyPolygon3D->aPoly3DList.push_back( pPoly3D );
/*N*/ }
/*N*/ else
diff --git a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
index 6ea6207..f9fe918 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
@@ -279,12 +279,6 @@ namespace binfilter {
/*N*/ return E3D_POLYGONOBJ_ID;
/*N*/ }
-/*************************************************************************
-|*
-|* Wireframe erzeugen
-|*
-\************************************************************************/
-
/*************************************************************************
|*
@@ -353,23 +347,6 @@ namespace binfilter {
/*N*/ ReCreateGeometry();
/*N*/ }
-/*************************************************************************
-|*
-|* Zuweisungsoperator
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* LineOnly setzen
-|*
-\************************************************************************/
-
-/*N*/ void E3dPolygonObj::SetLineOnly(BOOL /*bNew*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
index 057f418..3d54f90 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
@@ -29,40 +29,21 @@
#include "xdef.hxx"
-
-
-
-
-
-
-
-
-
-
-
#include "globl3d.hxx"
#include "polysc3d.hxx"
-
-
-
-
-
-
namespace binfilter {
-#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue()
-
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-/*N*/ TYPEINIT1(E3dPolyScene, E3dScene);
+TYPEINIT1(E3dPolyScene, E3dScene);
-/*N*/ E3dPolyScene::E3dPolyScene()
-/*N*/ : E3dScene()
-/*N*/ {
-/*N*/ }
+E3dPolyScene::E3dPolyScene()
+ : E3dScene()
+{
+}
/*************************************************************************
|*
@@ -70,10 +51,10 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ UINT16 E3dPolyScene::GetObjIdentifier() const
-/*N*/ {
-/*N*/ return E3D_POLYSCENE_ID;
-/*N*/ }
+UINT16 E3dPolyScene::GetObjIdentifier() const
+{
+ return E3D_POLYSCENE_ID;
+}
/*************************************************************************
|*
@@ -81,10 +62,14 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ bool E3dPolyScene::Paint(ExtOutputDevice& /*rOut*/,
-/*N*/ const SdrPaintInfoRec& /*rInfoRec*/) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
+bool E3dPolyScene::Paint(
+ ExtOutputDevice& /*rOut*/,
+ const SdrPaintInfoRec& /*rInfoRec*/
+) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return FALSE;
+}
}
diff --git a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
index a368835..8418d89 100644
--- a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
@@ -488,20 +488,6 @@ namespace binfilter {
/*N*/ ReCreateGeometry();
/*N*/ }
-/*************************************************************************
-|*
-|* Lokale Parameter setzen mit Geometrieneuerzeugung
-|*
-\************************************************************************/
-
-/*N*/ void E3dSphereObj::SetCenter(const Vector3D& /*rNew*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void E3dSphereObj::SetSize(const Vector3D& /*rNew*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
//////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
@@ -526,20 +512,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*************************************************************************
-|*
-|* Get the name of the object (singular)
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Get the name of the object (plural)
-|*
-\************************************************************************/
-
-
// EOF
}
diff --git a/binfilter/bf_svx/source/form/svx_ParseContext.cxx b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
index 7f718c6..f3f7156 100644
--- a/binfilter/bf_svx/source/form/svx_ParseContext.cxx
+++ b/binfilter/bf_svx/source/form/svx_ParseContext.cxx
@@ -58,24 +58,35 @@ using namespace ::connectivity;
/*?*/ }
//-----------------------------------------------------------------------------
-/*?*/ ::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ::com::sun::star::lang::Locale alocal; return alocal;
-/*?*/ }
+::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ ::com::sun::star::lang::Locale alocal;
+ return alocal;
+}
//-----------------------------------------------------------------------------
-/*?*/ ::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); String astring; return astring;
-/*?*/ }
+::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ String astring;
+ return astring;
+}
//-----------------------------------------------------------------------------
-/*?*/ ::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ByteString aKeyword; return aKeyword;
-/*?*/ }
+::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ ByteString aKeyword;
+ return aKeyword;
+}
// -----------------------------------------------------------------------------
-/*?*/ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString&) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return KEY_NONE;
-/*?*/ }
+IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString&) const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return KEY_NONE;
+}
// =============================================================================
diff --git a/binfilter/bf_svx/source/form/svx_fmdpage.cxx b/binfilter/bf_svx/source/form/svx_fmdpage.cxx
index 4999bc7..806d4de 100644
--- a/binfilter/bf_svx/source/form/svx_fmdpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmdpage.cxx
@@ -56,9 +56,12 @@ namespace binfilter {
/*N*/ DBG_DTOR(SvxFmDrawPage,NULL);
/*N*/ }
-/*N*/ ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); ::com::sun::star::uno::Sequence< sal_Int8 > a; return a;
-/*N*/ }
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ ::com::sun::star::uno::Sequence< sal_Int8 > a;
+ return a;
+}
/*N*/ ::com::sun::star::uno::Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException)
/*N*/ {
diff --git a/binfilter/bf_svx/source/form/svx_fmmodel.cxx b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
index 26b6e36..1df5e69 100644
--- a/binfilter/bf_svx/source/form/svx_fmmodel.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
@@ -67,12 +67,6 @@ struct FmFormModelImplData
|* Ctor
|*
\************************************************************************/
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
/*N*/ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SvPersist* pPers)
/*N*/ :SdrModel(rPath, pPool, pPers)
/*N*/ ,m_pImpl(NULL)
@@ -92,12 +86,6 @@ struct FmFormModelImplData
|* Ctor
|*
\************************************************************************/
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
/*N*/ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SvPersist* pPers,
/*N*/ bool bUseExtColorTable)
/*N*/ :SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS)
@@ -161,47 +149,21 @@ struct FmFormModelImplData
|* InsertPage
|*
\************************************************************************/
-/*N*/ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
-/*N*/ {
-/*?*/ SetObjectShell(pObjShell);
-/*N*/
-/*N*/ SdrModel::InsertPage( pPage, nPos );
-/*N*/
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if ( !m_pImpl->bMovingPage )
-/*N*/ {
-/*N*/ // this flag here is kind of a hack.
-/*N*/ // When a page is moved, the SdrModel::MovePage calls an InsertPage only, but
-/*N*/ // no preceding RemovePage. Thus, we (as a derivee) don't have a chance to see
-/*N*/ // that the page which is just being inserted is (in real) already a part of the
-/*N*/ // model. Especially, we do not have a change to notice that the UndoEnvironment
-/*N*/ // already _knows_ the forms we're just going to add below.
-/*N*/ //
-/*N*/ // The real solution to this would have been to fix SdrModel::MovePage, which
-/*N*/ // is buggy in it's current form (as it violates the semantics of InsertPage, which
-/*N*/ // is: insert a page which /currently is not part of any model/).
-/*N*/ // However, this change in the SdrModel is much too risky.
-/*N*/ //
-/*N*/ // Another solution to this would have been to track (in the UndoEnv) which pages
-/*N*/ // we know, and ignore any AddForms calls which are for such a page.
-/*N*/ // But I refuse to do this (much more) work to hack a bug in the SdrModel.
-/*N*/ //
-/*N*/ // I the decision is to do this "small hack" here (which I don't consider really
-/*N*/ // bad).
-/*N*/ //
-/*N*/ // #i3235#
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
+void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
+{
+ SetObjectShell(pObjShell);
+ SdrModel::InsertPage( pPage, nPos );
+}
/*************************************************************************
|*
|* MovePage
|*
\************************************************************************/
-/*?*/ void FmFormModel::MovePage( USHORT, USHORT )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
+void FmFormModel::MovePage( USHORT, USHORT )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+}
/*************************************************************************
|*
diff --git a/binfilter/bf_svx/source/form/svx_fmobj.cxx b/binfilter/bf_svx/source/form/svx_fmobj.cxx
index 46bfefd..76f2b23 100644
--- a/binfilter/bf_svx/source/form/svx_fmobj.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmobj.cxx
@@ -96,14 +96,6 @@ using namespace ::binfilter::svxform;
/*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > xNewParent;
/*N*/ ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor> aNewEvents;
/*N*/
-/*N*/ // calc the new parent for my model (within the new page's forms hierarchy)
-/*N*/ // do we have a history ? (from :Clone)
-/*N*/ if (m_xEnvironmentHistory.is())
-/*N*/ {
-/*N*/ // the element in *m_pEnvironmentHistory which is equivalent to my new parent (which (perhaps) has to be created within _pNewPage->GetForms)
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if (!xNewParent.is())
/*N*/ {
/*N*/ // are we a valid part of our current page forms ?
@@ -119,10 +111,6 @@ using namespace ::binfilter::svxform;
/*?*/ break;
/*?*/ xSearch = ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > (xSearch->getParent(), ::com::sun::star::uno::UNO_QUERY);
/*?*/ }
-/*?*/ if (xSearch.is()) // implies xSearch == xOldForms, which means we're a valid part of our current page forms hierarchy
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svx/source/form/svx_fmobjfac.cxx b/binfilter/bf_svx/source/form/svx_fmobjfac.cxx
index 1f195fe..ac6fe8b 100644
--- a/binfilter/bf_svx/source/form/svx_fmobjfac.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmobjfac.cxx
@@ -91,7 +91,7 @@ using namespace ::binfilter::svxform;
/*N*/ pObjFactory->pNewObj = new FmFormObj(pObjFactory->nIdentifier);
/*N*/ } break;
/*?*/ default:
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
+ break;
/*?*/ }
/*?*/ }
/*N*/
diff --git a/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx b/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx
deleted file mode 100644
index 1de96bb..0000000
--- a/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx
+++ /dev/null
@@ -1,65 +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 _ACCESSIBLESTRINGWRAP_HXX
-#define _ACCESSIBLESTRINGWRAP_HXX
-
-#include <sal/types.h>
-
-#include <tools/string.hxx>
-class OutputDevice;
-class Rectangle;
-class Point;
-namespace binfilter {
-
-
-class SvxFont;
-
-//------------------------------------------------------------------------
-//
-// AccessibleStringWrap declaration
-//
-//------------------------------------------------------------------------
-
-class AccessibleStringWrap
-{
-public:
-
- AccessibleStringWrap( OutputDevice&, SvxFont&, const String&){DBG_BF_ASSERT(0, "STRIP");}
-
- sal_Bool GetCharacterBounds(sal_Int32, Rectangle&){DBG_BF_ASSERT(0, "STRIP"); return false;}
- sal_Int32 GetIndexAtPoint(const Point&){DBG_BF_ASSERT(0, "STRIP"); return 0;}
-
-private:
-
-};
-
-}//end of namespace binfilter
-#endif /* _ACCESSIBLESTRINGWRAP_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/inc/sqlparserclient.hxx b/binfilter/bf_svx/source/inc/sqlparserclient.hxx
index ac77991..c581c08 100644
--- a/binfilter/bf_svx/source/inc/sqlparserclient.hxx
+++ b/binfilter/bf_svx/source/inc/sqlparserclient.hxx
@@ -53,8 +53,6 @@ namespace svxform
protected:
OSQLParserClient(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
-
- protected:
};
//........................................................................
diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx
index 2bd59e2..45435ed 100644
--- a/binfilter/bf_svx/source/items/svx_algitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_algitem.cxx
@@ -37,7 +37,6 @@
#define ITEMID_HORJUSTIFY 0
#define ITEMID_VERJUSTIFY 0
#define ITEMID_ORIENTATION 0
-#define ITEMID_LINEBREAK 0
#define ITEMID_MARGIN 0
#include <tools/stream.hxx>
@@ -194,10 +193,11 @@ using namespace ::com::sun::star;
/*N*/ }
//------------------------------------------------------------------------
-/*?*/ USHORT SvxHorJustifyItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
+USHORT SvxHorJustifyItem::GetValueCount() const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return 0;
+}
// class SvxVerJustifyItem -----------------------------------------------
@@ -272,10 +272,11 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*?*/ USHORT SvxVerJustifyItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
+USHORT SvxVerJustifyItem::GetValueCount() const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return 0;
+}
// class SvxOrientationItem ----------------------------------------------
@@ -348,10 +349,11 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*?*/ USHORT SvxOrientationItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
+USHORT SvxOrientationItem::GetValueCount() const
+{
+ DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
+ return 0;
+}
// class SvxMarginItem ---------------------------------------------------
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
index 85f6476..4f72279 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx
@@ -525,16 +525,7 @@ void SAL_CALL Svx3DCubeObject::setPropertyValue( const OUString& aPropertyName,
((E3dCubeObj*)pObj)->SetCubeSize(aLclSize);
}
}
- else if(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_3D_POS_IS_CENTER)) )
- {
- // sal_Bool bPosIsCenter in das Objekt packen
- if( aValue.getValueType() == ::getCppuBooleanType() )
- {
- sal_Bool bNew = *(sal_Bool*)aValue.getValue();
- ((E3dCubeObj*)pObj)->SetPosIsCenter(bNew);
- }
- }
- else
+ else if( !(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_3D_POS_IS_CENTER))) )
{
SvxShape::setPropertyValue( aPropertyName, aValue );
}
@@ -627,21 +618,13 @@ void SAL_CALL Svx3DSphereObject::setPropertyValue( const OUString& aPropertyName
{
// Position in das Objekt packen
drawing::Position3D aUnoPos;
- if( aValue >>= aUnoPos )
- {
- Vector3D aPos(aUnoPos.PositionX, aUnoPos.PositionY, aUnoPos.PositionZ);
- ((E3dSphereObj*)pObj)->SetCenter(aPos);
- }
+ aValue >>= aUnoPos;
}
else if(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_3D_SIZE)))
{
// Groesse in das Objekt packen
drawing::Direction3D aDir;
- if( aValue >>= aDir )
- {
- Vector3D aPos(aDir.DirectionX, aDir.DirectionY, aDir.DirectionZ);
- ((E3dSphereObj*)pObj)->SetSize(aPos);
- }
+ aValue >>= aDir;
}
else
{
@@ -1069,16 +1052,7 @@ void SAL_CALL Svx3DPolygonObject::setPropertyValue( const OUString& aPropertyNam
// Polygon setzen
((E3dPolygonObj*)pObj)->SetPolyTexture3D(aNewPolyPolygon);
}
- else if(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_3D_LINEONLY)) )
- {
- // sal_Bool bLineOnly in das Objekt packen
- if( aValue.getValueType() == ::getCppuBooleanType() )
- {
- sal_Bool bNew = *(sal_Bool*)aValue.getValue();
- ((E3dPolygonObj*)pObj)->SetLineOnly(bNew);
- }
- }
- else
+ else if( !(pObj && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_3D_LINEONLY)) ))
{
SvxShape::setPropertyValue(aPropertyName, aValue);
}
diff --git a/binfilter/bf_svx/source/unoedit/svx_UnoForbiddenCharsTable.cxx b/binfilter/bf_svx/source/unoedit/svx_UnoForbiddenCharsTable.cxx
index 2f1f5eb..4ea9f56 100644
--- a/binfilter/bf_svx/source/unoedit/svx_UnoForbiddenCharsTable.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_UnoForbiddenCharsTable.cxx
@@ -109,9 +109,6 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale
if(!mxForbiddenChars.is())
throw RuntimeException();
- const LanguageType eLang = SvxLocaleToLanguage( rLocale );
- mxForbiddenChars->ClearForbiddenCharacters( eLang );
-
onChange();
}
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx b/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx
index 6c1766b..d4be18f 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx
@@ -41,10 +41,6 @@
#include <algorithm>
-
-
-
-
//------------------------------------------------------------------------
//
// Project-local header
@@ -52,11 +48,9 @@
//------------------------------------------------------------------------
#include "unoedprx.hxx"
-
#include "unotext.hxx"
-
#include "editeng.hxx"
-#include "AccessibleStringWrap.hxx"
+
namespace binfilter {
using namespace ::com::sun::star;
@@ -723,20 +717,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
if( aIndex.InBullet() )
{
EBulletInfo aBulletInfo = GetBulletInfo( nPara );
-
- OutputDevice* pOutDev = GetRefDevice();
-
- DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetCharBounds: No ref device");
-
- // preset if anything goes wrong below
aRect = aBulletInfo.aBounds; // better than nothing
- if( pOutDev )
- {
- AccessibleStringWrap aStringWrap( *pOutDev, aBulletInfo.aFont, aBulletInfo.aText );
-
- if( aStringWrap.GetCharacterBounds( aIndex.GetBulletOffset(), aRect ) )
- aRect.Move( aBulletInfo.aBounds.Left(), aBulletInfo.aBounds.Top() );
- }
}
else
{
@@ -750,18 +731,9 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
if( pOutDev )
{
ESelection aSel = MakeEESelection( aIndex );
-
SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mrTextForwarder->GetAttribs( aSel ) );
- AccessibleStringWrap aStringWrap( *pOutDev,
- aFont,
- mrTextForwarder->GetText( aSel ) );
-
Rectangle aStartRect = mrTextForwarder->GetCharBounds( nPara, static_cast< USHORT >( aIndex.GetEEIndex() ) );
-
- if( !aStringWrap.GetCharacterBounds( aIndex.GetFieldOffset(), aRect ) )
- aRect = aStartRect;
- else
- aRect.Move( aStartRect.Left(), aStartRect.Top() );
+ aRect = aStartRect;
}
}
}
@@ -835,16 +807,10 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
if( !pOutDev )
return sal_False;
- AccessibleStringWrap aStringWrap( *pOutDev, aBulletInfo.aFont, aBulletInfo.aText );
-
Point aPoint = rPoint;
aPoint.Move( -aBulletInfo.aBounds.Left(), -aBulletInfo.aBounds.Top() );
- DBG_ASSERT(aStringWrap.GetIndexAtPoint( aPoint ) >= 0 &&
- aStringWrap.GetIndexAtPoint( aPoint ) <= USHRT_MAX,
- "SvxAccessibleTextIndex::SetIndex: index value overflow");
-
- nIndex = static_cast< USHORT > (aStringWrap.GetIndexAtPoint( aPoint ));
+ nIndex = 0;
return sal_True;
}
}
@@ -860,19 +826,12 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
ESelection aSelection = MakeEESelection( aIndex );
SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mrTextForwarder->GetAttribs( aSelection ) );
- AccessibleStringWrap aStringWrap( *pOutDev,
- aFont,
- mrTextForwarder->GetText( aSelection ) );
Rectangle aRect = mrTextForwarder->GetCharBounds( nPara, aIndex.GetEEIndex() );
Point aPoint = rPoint;
aPoint.Move( -aRect.Left(), -aRect.Top() );
- DBG_ASSERT(aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( rPoint ) >= 0 &&
- aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( rPoint ) <= USHRT_MAX,
- "SvxAccessibleTextIndex::SetIndex: index value overflow");
-
- nIndex = static_cast< USHORT >(aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( aPoint ));
+ nIndex = static_cast< USHORT >( aIndex.GetIndex() );
return sal_True;
}
diff --git a/binfilter/inc/bf_svx/ParseContext.hxx b/binfilter/inc/bf_svx/ParseContext.hxx
index 9a7dece..f56eefb 100644
--- a/binfilter/inc/bf_svx/ParseContext.hxx
+++ b/binfilter/inc/bf_svx/ParseContext.hxx
@@ -61,10 +61,6 @@ namespace svxform
*/
virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const;
- public:
- // helper methods to ease access to some of the characteristics of the locale
- sal_Unicode getNumDecimalSep( ) const;
- sal_Unicode getNumThousandSep( ) const;
};
//==========================================================================
diff --git a/binfilter/inc/bf_svx/algitem.hxx b/binfilter/inc/bf_svx/algitem.hxx
index 51f8b23..817fed7 100644
--- a/binfilter/inc/bf_svx/algitem.hxx
+++ b/binfilter/inc/bf_svx/algitem.hxx
@@ -36,6 +36,8 @@
#include <bf_svtools/eitem.hxx>
#include <bf_svx/svxenum.hxx>
class SvStream;
+
+
namespace binfilter {
diff --git a/binfilter/inc/bf_svx/cube3d.hxx b/binfilter/inc/bf_svx/cube3d.hxx
index 6bd18a8..9b1795f 100644
--- a/binfilter/inc/bf_svx/cube3d.hxx
+++ b/binfilter/inc/bf_svx/cube3d.hxx
@@ -91,7 +91,6 @@ public:
void SetCubeSize(const Vector3D& rNew);
const Vector3D& GetCubeSize() { return aCubeSize; }
- void SetPosIsCenter(BOOL bNew);
BOOL GetPosIsCenter() { return (BOOL)bPosIsCenter; }
UINT16 GetSideFlags() { return nSideFlags; }
diff --git a/binfilter/inc/bf_svx/extrud3d.hxx b/binfilter/inc/bf_svx/extrud3d.hxx
index 56285b4..bf9ff78 100644
--- a/binfilter/inc/bf_svx/extrud3d.hxx
+++ b/binfilter/inc/bf_svx/extrud3d.hxx
@@ -126,18 +126,6 @@ public:
const PolyPolygon3D &GetExtrudePolygon() { return aExtrudePolygon; }
- // #107245#
- // void SetExtrudeSmoothed(BOOL bNew);
- // BOOL GetExtrudeSmoothed() const { return bExtrudeSmoothed; }
- // void SetExtrudeSmoothFrontBack(BOOL bNew);
- // BOOL GetExtrudeSmoothFrontBack() const { return bExtrudeSmoothFrontBack; }
- // void SetExtrudeCharacterMode(BOOL bNew);
- // BOOL GetExtrudeCharacterMode() const { return bExtrudeCharacterMode; }
- // void SetExtrudeCloseFront(BOOL bNew);
- // BOOL GetExtrudeCloseFront() const { return bExtrudeCloseFront; }
- // void SetExtrudeCloseBack(BOOL bNew);
- // BOOL GetExtrudeCloseBack() const { return bExtrudeCloseBack; }
-
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void PostItemChange(const sal_uInt16 nWhich);
diff --git a/binfilter/inc/bf_svx/fmmodel.hxx b/binfilter/inc/bf_svx/fmmodel.hxx
index a634a5f..b886309 100644
--- a/binfilter/inc/bf_svx/fmmodel.hxx
+++ b/binfilter/inc/bf_svx/fmmodel.hxx
@@ -51,7 +51,6 @@ class FmFormModel :
{
private:
FmFormModelImplData* m_pImpl;
-// FmXUndoEnvironment* pUndoEnv;
SfxObjectShell* pObjShell;
sal_Bool bStreamingOldVersion;
diff --git a/binfilter/inc/bf_svx/forbiddencharacterstable.hxx b/binfilter/inc/bf_svx/forbiddencharacterstable.hxx
index 400325a..bb09b52 100644
--- a/binfilter/inc/bf_svx/forbiddencharacterstable.hxx
+++ b/binfilter/inc/bf_svx/forbiddencharacterstable.hxx
@@ -66,7 +66,6 @@ public:
const ::com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( USHORT nLanuage, BOOL bGetDefault ) const;
void SetForbiddenCharacters( USHORT nLanuage , const ::com::sun::star::i18n::ForbiddenCharacters& );
- void ClearForbiddenCharacters( USHORT nLanuage );
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/lathe3d.hxx b/binfilter/inc/bf_svx/lathe3d.hxx
index fb5da43..28a0bef 100644
--- a/binfilter/inc/bf_svx/lathe3d.hxx
+++ b/binfilter/inc/bf_svx/lathe3d.hxx
@@ -56,12 +56,6 @@ class E3dLatheObj : public E3dCompoundObject
// #78972#
PolyPolygon3D maLinePolyPolygon;
- // #107245# unsigned bLatheSmoothed : 1;
- // #107245# unsigned bLatheSmoothFrontBack : 1;
- // #107245# unsigned bLatheCharacterMode : 1;
- // #107245# unsigned bLatheCloseFront : 1;
- // #107245# unsigned bLatheCloseBack : 1;
-
protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
@@ -139,18 +133,6 @@ class E3dLatheObj : public E3dCompoundObject
double GetLatheScale() const { return fLatheScale; }
- // #107245#
- // void SetLatheSmoothed(BOOL bNew);
- // BOOL GetLatheSmoothed() const { return bLatheSmoothed; }
- // void SetLatheSmoothFrontBack(BOOL bNew);
- // BOOL GetLatheSmoothFrontBack() const { return bLatheSmoothFrontBack; }
- // void SetLatheCharacterMode(BOOL bNew);
- // BOOL GetLatheCharacterMode() const { return bLatheCharacterMode; }
- // void SetLatheCloseFront(BOOL bNew);
- // BOOL GetLatheCloseFront() const { return bLatheCloseFront; }
- // void SetLatheCloseBack(BOOL bNew);
- // BOOL GetLatheCloseBack() const { return bLatheCloseBack; }
-
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void PostItemChange(const sal_uInt16 nWhich);
diff --git a/binfilter/inc/bf_svx/obj3d.hxx b/binfilter/inc/bf_svx/obj3d.hxx
index 8b0fdae..4920f36 100644
--- a/binfilter/inc/bf_svx/obj3d.hxx
+++ b/binfilter/inc/bf_svx/obj3d.hxx
@@ -262,7 +262,7 @@ class E3dObject : public SdrAttrObj
BOOL GetSelected() { return bIsSelected; }
// Aufbrechen
- virtual SdrAttrObj* GetBreakObj();
+ virtual SdrAttrObj* GetBreakObj() { return NULL; }
};
/*************************************************************************
diff --git a/binfilter/inc/bf_svx/polygn3d.hxx b/binfilter/inc/bf_svx/polygn3d.hxx
index 5d2edc4..b1722f3 100644
--- a/binfilter/inc/bf_svx/polygn3d.hxx
+++ b/binfilter/inc/bf_svx/polygn3d.hxx
@@ -82,7 +82,6 @@ public:
// LineOnly?
BOOL GetLineOnly() { return bLineOnly; }
- void SetLineOnly(BOOL bNew);
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/polysc3d.hxx b/binfilter/inc/bf_svx/polysc3d.hxx
index 3cfd4f8..051fcc7 100644
--- a/binfilter/inc/bf_svx/polysc3d.hxx
+++ b/binfilter/inc/bf_svx/polysc3d.hxx
@@ -57,13 +57,6 @@ public:
// Zeichenmethode
virtual bool Paint(ExtOutputDevice&, const SdrPaintInfoRec&) const;
- // Die Kontur fuer TextToContour
-
-
-protected:
-
-
-
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/sphere3d.hxx b/binfilter/inc/bf_svx/sphere3d.hxx
index 8219de6..705836c 100644
--- a/binfilter/inc/bf_svx/sphere3d.hxx
+++ b/binfilter/inc/bf_svx/sphere3d.hxx
@@ -86,10 +86,6 @@ public:
// Give out simple line geometry
virtual void GetLineGeometry(PolyPolygon3D& rLinePolyPolygon) const;
- // Lokale Parameter setzen mit Geometrieneuerzeugung
- void SetCenter(const Vector3D& rNew);
- void SetSize(const Vector3D& rNew);
-
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void PostItemChange(const sal_uInt16 nWhich);
More information about the Libreoffice-commits
mailing list