diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-31 22:30:22 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-31 22:41:12 +0200 |
commit | f212aa9f84246f9bc1feb3b169885c5e717a10cd (patch) | |
tree | c2f8dfc5576a37c9881d0d024a89bbc2fe8d5ff9 | |
parent | 8d6da3b8aed0b523375e00eb5b5e3c2b4ca89edf (diff) |
fix existing comments
Change-Id: I06dca63053dae5d3dceb49bf67adb0c100b56e8b
-rw-r--r-- | cli_ure/source/uno_bridge/cli_data.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 6 | ||||
-rw-r--r-- | include/drawinglayer/processor3d/zbufferprocessor3d.hxx | 3 | ||||
-rw-r--r-- | reportdesign/inc/RptModel.hxx | 6 | ||||
-rw-r--r-- | svtools/source/control/fmtfield.cxx | 8 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 49 | ||||
-rw-r--r-- | sw/source/filter/html/parcss1.hxx | 9 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 94 | ||||
-rw-r--r-- | sw/source/ui/shells/grfsh.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/swcli.cxx | 1 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 135 |
13 files changed, 157 insertions, 172 deletions
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 76739d622e7d..d6b7000359d9 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -62,13 +62,13 @@ inline auto_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32 nSize ) System::Object^ Bridge::map_uno2cli(uno_Interface * pUnoI, typelib_InterfaceTypeDescription *pTD) const { System::Object^ retVal= nullptr; -// get oid + // get oid rtl_uString * pOid = 0; (*m_uno_env->getObjectIdentifier)( m_uno_env, &pOid, pUnoI ); OSL_ASSERT( 0 != pOid ); OUString oid(pOid, SAL_NO_ACQUIRE); - //see if the interface was already mapped + // see if the interface was already mapped System::Type^ ifaceType= mapUnoType(reinterpret_cast<typelib_TypeDescription*>(pTD)); System::String^ sOid= mapUnoString(oid.pData); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index bce93978e7c6..189bc53fb4c2 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -865,7 +865,7 @@ void OQueryController::impl_initialize() OUString sCommand; m_nCommandType = CommandType::QUERY; - // . reading parameters: + // reading parameters: // legacy parameters first (later overwritten by regular parameters) OUString sIndependentSQLCommand; @@ -936,7 +936,7 @@ void OQueryController::impl_initialize() m_bGraphicalDesign = false; } - // . initial design + // initial design bool bForceInitialDesign = false; Sequence< PropertyValue > aCurrentQueryDesignProps; aCurrentQueryDesignProps = rArguments.getOrDefault( "CurrentQueryDesign", aCurrentQueryDesignProps ); @@ -1119,7 +1119,7 @@ void OQueryController::setQueryComposer() sal_Bool OQueryController::Construct(Window* pParent) { - // TODO: we have to check if we should create the text- or the design- view + // TODO: we have to check if we should create the text view or the design view setView( * new OQueryContainerWindow( pParent, *this, getORB() ) ); diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx index 347996de0c5f..c42d18475022 100644 --- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -47,8 +47,7 @@ namespace drawinglayer { namespace processor3d { - /** ZBufferProcessor3D class - + /** This 3D renderer derived from DefaultProcessor3D renders all feeded primitives to a 2D raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle transparent content. diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 5147b4c135d1..8c7161946209 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -61,7 +61,7 @@ public: virtual void SetChanged(sal_Bool bFlg = sal_True); virtual SdrPage* AllocPage(bool bMasterPage); virtual SdrPage* RemovePage(sal_uInt16 nPgNum); - /** returns the numbering type that is used to format page fields in drawing shapes */ + /** @returns the numbering type that is used to format page fields in drawing shapes */ virtual SvxNumType GetPageNumType() const; OXUndoEnvironment& GetUndoEnv(); @@ -75,8 +75,8 @@ public: /** returns the page which belongs to a section * - * \param _xSection - * \return The page or <NULL/> when no page could be found. + * @param _xSection + * @return The page or <NULL/> when no page could be found. */ OReportPage* getPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index a7368e1601ed..1749424dc131 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -660,7 +660,7 @@ sal_Bool FormattedField::SetFormat(const OUString& rFormatString, LanguageType e sal_Bool FormattedField::GetThousandsSep() const { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), - "FormattedField::GetThousandsSep : your'e sure what your'e doing when setting the precision of a text format ?"); + "FormattedField::GetThousandsSep : Are you sure what you are doing when setting the precision of a text format?"); bool bThousand, IsRed; sal_uInt16 nPrecision, nAnzLeading; @@ -672,7 +672,7 @@ sal_Bool FormattedField::GetThousandsSep() const void FormattedField::SetThousandsSep(sal_Bool _bUseSeparator) { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), - "FormattedField::SetThousandsSep : your'e sure what your'e doing when setting the precision of a text format ?"); + "FormattedField::SetThousandsSep : Are you sure what you are doing when setting the precision of a text format?"); // get the current settings bool bThousand, IsRed; @@ -701,7 +701,7 @@ void FormattedField::SetThousandsSep(sal_Bool _bUseSeparator) sal_uInt16 FormattedField::GetDecimalDigits() const { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), - "FormattedField::GetDecimalDigits : your'e sure what your'e doing when setting the precision of a text format ?"); + "FormattedField::GetDecimalDigits : Are you sure what you are doing when setting the precision of a text format?"); bool bThousand, IsRed; sal_uInt16 nPrecision, nAnzLeading; @@ -713,7 +713,7 @@ sal_uInt16 FormattedField::GetDecimalDigits() const void FormattedField::SetDecimalDigits(sal_uInt16 _nPrecision) { DBG_ASSERT(!ImplGetFormatter()->IsTextFormat(m_nFormatKey), - "FormattedField::SetDecimalDigits : your'e sure what your'e doing when setting the precision of a text format ?"); + "FormattedField::SetDecimalDigits : Are you sure what you are doing when setting the precision of a text format?"); // get the current settings bool bThousand, IsRed; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 4806a912eba7..110a87c85502 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2662,7 +2662,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe switch (nExecutionResult) { case SID_FM_DELETEROWS: - // delete asynchron + // delete asynchronously if (m_nDeleteEvent) Application::RemoveUserEvent(m_nDeleteEvent); m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete)); @@ -3012,7 +3012,7 @@ void DbGridControl::Undo() m_xCurrentRow = m_xDataRow; if (bAppending && (DbGridControl_Base::IsModified() || bDirty)) - // remove the row + // remove the row if (m_nCurrentPos == GetRowCount() - 2) { // maybe we already removed it (in resetCurrentRow, called if the above moveToInsertRow // caused our data source form to be reset - which should be the usual case ....) @@ -3057,7 +3057,7 @@ void DbGridControl::resetCurrentRow() m_xCurrentRow = m_xDataRow; } - RowModified(GetCurRow()); // will update the current controller if affected + RowModified(GetCurRow()); // will update the current controller if affected } void DbGridControl::RowModified( long nRow, sal_uInt16 /*nColId*/ ) @@ -3250,7 +3250,7 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt) { if ((m_nOptions & OPT_DELETE) && GetSelectRowCount()) { - // delete asynchron + // delete asynchronously if (m_nDeleteEvent) Application::RemoveUserEvent(m_nDeleteEvent); m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete)); diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index e2f3bae339f4..6f08a455fc08 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1532,7 +1532,7 @@ SwUnderlineFont::~SwUnderlineFont() delete pFnt; } -//Helper for filters to find true lineheight of a font +/// Helper for filters to find true lineheight of a font long AttrSetToLineHeight( const IDocumentSettingAccess& rIDocumentSettingAccess, const SwAttrSet &rSet, const OutputDevice &rOut, sal_Int16 nScript) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 0f5dd17cccb4..dcb2b727a668 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -137,7 +137,7 @@ lcl_MaskRedlines( const SwTxtNode& rNode, OUStringBuffer& rText, return nNumOfMaskedRedlines; } -/* +/** * Used for spell checking. Deleted redlines and hidden characters are masked */ static sal_uInt16 @@ -172,7 +172,7 @@ lcl_MaskRedlinesAndHiddenText( const SwTxtNode& rNode, OUStringBuffer& rText, return nRedlinesMasked + nHiddenCharsMasked; } -/* +/** * Used for spell checking. Calculates a rectangle for repaint. */ static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, xub_StrLen nChgStart, xub_StrLen nChgEnd ) @@ -293,10 +293,9 @@ static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, xub_StrLen nChgStart, return aRect; } -/* +/** * Used for automatic styles. Used during RstAttr. */ - static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, const SfxItemSet* pSet1, sal_uInt16 nWhichId, @@ -347,13 +346,9 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, return bRet; } -/* - * void SwTxtNode::RstAttr(const SwIndex &rIdx, sal_uInt16 nLen) +/** Delete all attributes * - * Deletes all attributes, starting at position rIdx, for length nLen. - */ - -/* 5 cases: + * 5 cases: * 1) The attribute is completely in the deletion range: * -> delete it * 2) The end of the attribute is in the deletion range: @@ -366,6 +361,12 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess, * -> insert new attribute from end of deletion range to old end * 5) The attribute is outside the deletion range * -> nothing to do + * + * @param rIdx starting position + * @param nLen length of the deletion + * @param nthat ??? + * @param pSet ??? + * @param bInclRefToxMark ??? */ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich, const SfxItemSet* pSet, sal_Bool bInclRefToxMark ) @@ -388,7 +389,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich, const bool bNoLen = !nMin; - // We have to remember the "new" attributes, which have + // We have to remember the "new" attributes, that have // been introduced by splitting surrounding attributes (case 4). // They may not be forgotten inside the "Forget" function //std::vector< const SwTxtAttr* > aNewAttributes; @@ -1097,7 +1098,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs ) SwLanguageIterator aIter( *this, nBegin ); // Implicit changes require setting new attributes, which in turn destroys - // the attribute sequence on which aIter iterates. We store the necessary + // the attribute sequence on that aIter iterates. We store the necessary // coordinates and apply those changes after iterating through the text. typedef std::pair<xub_StrLen, xub_StrLen> ImplicitChangesRange; std::vector<ImplicitChangesRange> aImplicitChanges; @@ -1111,7 +1112,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs ) xub_StrLen nChPos = aIter.GetChgPos(); // the position at the end of the paragraph returns -1 - // which becomes 65535 when converted to xub_StrLen, + // that becomes 65535 when converted to xub_StrLen, // and thus must be cut to the end of the actual string. if (nChPos == (xub_StrLen) -1) { @@ -1368,14 +1369,12 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV Function scans words in current text and checks them in the smarttag libraries. If the check returns true to bounds of the - recognized words are stored into a list which is used later for drawing + recognized words are stored into a list that is used later for drawing the underline. - @param SwCntntNode* pActNode - - @param xub_StrLen nActPos - - @return SwRect: Repaint area + @param pActNode ??? + @param nActPos ??? + @return SwRect Repaint area */ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ ) { @@ -1619,12 +1618,12 @@ void SwTxtNode::TransliterateText( // proper thing to do. const sal_Int16 nWordType = WordType::ANYWORD_IGNOREWHITESPACES; - //! In order to have less trouble with changing text size, e.g. because - //! of ligatures or German small sz being resolved, we need to process - //! the text replacements from end to start. - //! This way the offsets for the yet to be changed words will be - //! left unchanged by the already replaced text. - //! For this we temporarily save the changes to be done in this vector + // In order to have less trouble with changing text size, e.g. because + // of ligatures or German small sz being resolved, we need to process + // the text replacements from end to start. + // This way the offsets for the yet to be changed words will be + // left unchanged by the already replaced text. + // For this we temporarily save the changes to be done in this vector std::vector< swTransliterationChgData > aChanges; swTransliterationChgData aChgData; diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 8497051773e7..36a78608bfc3 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -49,9 +49,7 @@ enum CSS1Token CSS1_HASH, CSS1_IMPORT_SYM, -// Feature: PrintExt - CSS1_PAGE_SYM, -// /Feature: PrintExt + CSS1_PAGE_SYM, // Feature: PrintExt CSS1_IMPORTANT_SYM, @@ -74,10 +72,7 @@ enum CSS1SelectorType CSS1_SELTYPE_CLASS, CSS1_SELTYPE_ID, CSS1_SELTYPE_PSEUDO, -// Feature: PrintExt - CSS1_SELTYPE_PAGE -// /Feature: PrintExt - + CSS1_SELTYPE_PAGE // Feature: PrintExt }; // Die folegende Klasse beschreibt einen Simple-Selector, also diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 301dfa8b2642..3d690792a361 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1074,16 +1074,16 @@ public: sal_uInt16 csw; // Count of fields in the array of "shorts" // Marke: "rgsw" Beginning of the array of shorts - sal_uInt16 wMagicCreated; // unique number Identifying the File's creator - // 0x6A62 is the creator ID for Word and is reserved. - // Other creators should choose a different value. - sal_uInt16 wMagicRevised; // identifies the File's last modifier - sal_uInt16 wMagicCreatedPrivate; // private data - sal_uInt16 wMagicRevisedPrivate; // private data + sal_uInt16 wMagicCreated; // unique number Identifying the File's creator + // 0x6A62 is the creator ID for Word and is reserved. + // Other creators should choose a different value. + sal_uInt16 wMagicRevised; // identifies the File's last modifier + sal_uInt16 wMagicCreatedPrivate; // private data + sal_uInt16 wMagicRevisedPrivate; // private data - sal_Int16 lidFE; // Language id if document was written by Far East version - // of Word (i.e. FIB.fFarEast is on) - sal_uInt16 clw; // Number of fields in the array of longs + sal_Int16 lidFE; // Language id if document was written by Far East version + // of Word (i.e. FIB.fFarEast is on) + sal_uInt16 clw; // Number of fields in the array of longs // Ende des Einschubs fuer WW8 ******************************************* @@ -1101,37 +1101,27 @@ public: WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream // Einschub fuer WW8 ***************************************************** - sal_Int32 pnFbpChpFirst; // when there was insufficient memory for Word to expand - // the PLCFbte at save time, the PLCFbte is written - // to the file in a linked list of 512-byte pieces - // starting with this pn. - /* - // folgende Felder existieren zwar so in der Datei, - // wir benutzen jedoch unten deklarierte General-Variablen - // fuer Ver67 und Ver8 gemeinsam. - sal_Int32 pnChpFirst; // the page number of the lowest numbered page in the - // document that records CHPX FKP information - sal_Int32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex - // files if the number of entries in the PLCFbteChpx - // is less than this, the PLCFbteChpx is incomplete. - */ - sal_Int32 pnFbpPapFirst; // when there was insufficient memory for Word to expand - // the PLCFbte at save time, the PLCFbte is written to - // the file in a linked list of 512-byte pieces - // starting with this pn - - sal_Int32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand - // the PLCFbte at save time, the PLCFbte is written to - // the file in a linked list of 512-byte pieces - // starting with this pn - sal_Int32 pnLvcFirst; // the page number of the lowest numbered page in the - // document that records LVC FKP information - sal_Int32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex - // files if the number of entries in the PLCFbtePapx is - // less than this, the PLCFbtePapx is incomplete. + sal_Int32 pnFbpChpFirst; // when there was insufficient memory for Word to expand + // the PLCFbte at save time, the PLCFbte is written + // to the file in a linked list of 512-byte pieces + // starting with this pn. + sal_Int32 pnFbpPapFirst; // when there was insufficient memory for Word to expand + // the PLCFbte at save time, the PLCFbte is written to + // the file in a linked list of 512-byte pieces + // starting with this pn + + sal_Int32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand + // the PLCFbte at save time, the PLCFbte is written to + // the file in a linked list of 512-byte pieces + // starting with this pn + sal_Int32 pnLvcFirst; // the page number of the lowest numbered page in the + // document that records LVC FKP information + sal_Int32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex + // files if the number of entries in the PLCFbtePapx is + // less than this, the PLCFbtePapx is incomplete. sal_Int32 fcIslandFirst; // ? sal_Int32 fcIslandLim; // ? - sal_uInt16 cfclcb; // Number of fields in the array of FC/LCB pairs. + sal_uInt16 cfclcb; // Number of fields in the array of FC/LCB pairs. // Ende des Einschubs fuer WW8 ******************************************* @@ -1538,28 +1528,28 @@ public: sal_uInt16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages sal_uInt16 copts_fExpShRtn : 1; // when 1, expand character spaces on the line ending SHIFT+RETURN // #i56856# - sal_Int16 dxaTab; // 720 twips default tab width + sal_Int16 dxaTab; // 720 twips - default tab width sal_uInt16 wSpare; // - sal_uInt16 dxaHotZ; // width of hyphenation hot zone measured in twips + sal_uInt16 dxaHotZ; // width of hyphenation hot zone measured in twips sal_uInt16 cConsecHypLim; // number of lines allowed to have consecutive hyphens - sal_uInt16 wSpare2; // reserved - sal_Int32 dttmCreated; // DTTM date and time document was created - sal_Int32 dttmRevised; // DTTM date and time document was last revised - sal_Int32 dttmLastPrint; // DTTM date and time document was last printed - sal_Int16 nRevision; // number of times document has been revised since its creation - sal_Int32 tmEdited; // time document was last edited - sal_Int32 cWords; // count of words tallied by last Word Count execution - sal_Int32 cCh; // count of characters tallied by last Word Count execution - sal_Int16 cPg; // count of pages tallied by last Word Count execution - sal_Int32 cParas; // count of paragraphs tallied by last Word Count execution + sal_uInt16 wSpare2; // reserved + sal_Int32 dttmCreated; // DTTM date and time document was created + sal_Int32 dttmRevised; // DTTM date and time document was last revised + sal_Int32 dttmLastPrint; // DTTM date and time document was last printed + sal_Int16 nRevision; // number of times document has been revised since its creation + sal_Int32 tmEdited; // time document was last edited + sal_Int32 cWords; // count of words tallied by last Word Count execution + sal_Int32 cCh; // count of characters tallied by last Word Count execution + sal_Int16 cPg; // count of pages tallied by last Word Count execution + sal_Int32 cParas; // count of paragraphs tallied by last Word Count execution sal_uInt16 rncEdn : 2; // restart endnote number code: 0 don't restart endnote numbering, 1 section, 2 page sal_uInt16 nEdn : 14; // beginning endnote number - sal_uInt16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document + sal_uInt16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document sal_uInt16 fPrintFormData : 1; // only print data inside of form fields sal_uInt16 fSaveFormData : 1; // only save document data that is inside of a form field. sal_uInt16 fShadeFormData : 1; // shade form fields - sal_uInt16 : 2; // reserved + sal_uInt16 : 2; // reserved sal_uInt16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count sal_Int32 cLines; // count of lines tallied by last Word Count operation sal_Int32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index a24bae455889..9e2c7649c0aa 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -295,12 +295,12 @@ void SwGrfShell::Execute(SfxRequest &rReq) aSet.Put(SfxFrameItem( SID_DOCFRAME, &GetView().GetViewFrame()->GetTopFrame())); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialogdiet fail!"); + OSL_ENSURE(pFact, "no dialog factory!"); SfxAbstractTabDialog* pDlg = pFact->CreateFrmTabDialog("PictureDialog", GetView().GetViewFrame(), GetView().GetWindow(), aSet, false); - OSL_ENSURE(pDlg, "Dialogdiet fail!"); + OSL_ENSURE(pDlg, "no tab dialog!"); if (nSlot == FN_DRAW_WRAP_DLG) pDlg->SetCurPageId("wrap"); diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx index 817c660d7be0..3ee05fef848a 100644 --- a/sw/source/ui/uiview/swcli.cxx +++ b/sw/source/ui/uiview/swcli.cxx @@ -123,7 +123,6 @@ void SwOleClient::ViewChanged() } catch (const uno::Exception&) { - // this is an error OSL_FAIL( "Something goes wrong on requesting object size!\n" ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index bd282b9988f1..57237b7f3c82 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1992,7 +1992,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt { const sal_Unicode* pStr = rInString.getStr(); sal_Int32 nLen = rInString.getLength(); -//prepare a unicode string, encrypt it + //prepare a unicode string, encrypt it if( checkEncryptionBufferSize( nLen*2 ) ) { enableStringEncryption( nInObjectNumber ); @@ -2000,7 +2000,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt sal_Int32 nChars = 2; *pCopy++ = 0xFE; *pCopy++ = 0xFF; -// we need to prepare a byte stream from the unicode string buffer + // we need to prepare a byte stream from the unicode string buffer for( int i = 0; i < nLen; i++ ) { sal_Unicode aUnChar = pStr[i]; @@ -2008,9 +2008,9 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt *pCopy++ = (sal_uInt8)( aUnChar & 255 ); nChars += 2; } -//encrypt in place + //encrypt in place rtl_cipher_encodeARCFOUR( m_aCipher, m_pEncryptionBuffer, nChars, m_pEncryptionBuffer, nChars ); -//now append, hexadecimal (appendHex), the encrypted result + //now append, hexadecimal (appendHex), the encrypted result for(int i = 0; i < nChars; i++) appendHex( m_pEncryptionBuffer[i], rOutBuffer ); } @@ -2024,10 +2024,10 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer& rInString, { rOutBuffer.append( "(" ); sal_Int32 nChars = rInString.getLength(); -//check for encryption, if ok, encrypt the string, then convert with appndLiteralString + //check for encryption, if ok, encrypt the string, then convert with appndLiteralString if( m_aContext.Encryption.Encrypt() && checkEncryptionBufferSize( nChars ) ) { -//encrypt the string in a buffer, then append it + //encrypt the string in a buffer, then append it enableStringEncryption( nInObjectNumber ); rtl_cipher_encodeARCFOUR( m_aCipher, rInString.getStr(), nChars, m_pEncryptionBuffer, nChars ); appendLiteralString( (const sal_Char*)m_pEncryptionBuffer, nChars, rOutBuffer ); @@ -2152,7 +2152,7 @@ bool PDFWriterImpl::writeBuffer( const void* pBuffer, sal_uInt64 nBytes ) bool buffOK = true; if( m_bEncryptThisStream ) { -/* implement the encryption part of the PDF spec encryption algorithm 3.1 */ + /* implement the encryption part of the PDF spec encryption algorithm 3.1 */ if( ( buffOK = checkEncryptionBufferSize( static_cast<sal_Int32>(nBytes) ) ) ) rtl_cipher_encodeARCFOUR( m_aCipher, (sal_uInt8*)pBuffer, static_cast<sal_Size>(nBytes), @@ -4404,9 +4404,10 @@ we check in the following sequence: sal_Bool bTargetHasPDFExtension = sal_False; INetProtocol eTargetProtocol = aTargetURL.GetProtocol(); bool bIsUNCPath = false; -// check if the protocol is a known one, or if there is no protocol at all (on target only) -// if there is no protocol, make the target relative to the current document directory -// getting the needed URL information from the current document path + + // check if the protocol is a known one, or if there is no protocol at all (on target only) + // if there is no protocol, make the target relative to the current document directory + // getting the needed URL information from the current document path if( eTargetProtocol == INET_PROT_NOT_VALID ) { if( rLink.m_aURL.getLength() > 4 && rLink.m_aURL.startsWith("\\\\\\\\")) @@ -4420,17 +4421,17 @@ we check in the following sequence: //target document aNewBase.insertName( rLink.m_aURL ); aTargetURL = aNewBase;//reassign the new target URL -//recompute the target protocol, with the new URL -//normal URL processing resumes + //recompute the target protocol, with the new URL + //normal URL processing resumes eTargetProtocol = aTargetURL.GetProtocol(); } } OUString aFileExtension = aTargetURL.GetFileExtension(); -// Check if the URL ends in '/': if yes it's a directory, -// it will be forced to a URI link. -// possibly a malformed URI, leave it as it is, force as URI + // Check if the URL ends in '/': if yes it's a directory, + // it will be forced to a URI link. + // possibly a malformed URI, leave it as it is, force as URI if( aTargetURL.hasFinalSlash() ) m_aContext.DefaultLinkAction = PDFWriter::URIAction; @@ -4453,14 +4454,14 @@ we check in the following sequence: if( bChangeFileExtensionToPDF ) aTargetURL.setExtension(OUString( "pdf" ) ); } -//check if extension is pdf, see if GoToR should be forced + //check if extension is pdf, see if GoToR should be forced bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(OUString( "pdf" ) ); if( m_aContext.ForcePDFAction && bTargetHasPDFExtension ) nSetGoToRMode++; } -//prepare the URL, if relative or not + //prepare the URL, if relative or not INetProtocol eBaseProtocol = aDocumentURL.GetProtocol(); -//queue the string common to all types of actions + //queue the string common to all types of actions aLine.append( "/A<</Type/Action/S"); if( bIsUNCPath ) // handle Win UNC paths { @@ -4473,7 +4474,7 @@ we check in the following sequence: { bool bSetRelative = false; bool bFileSpec = false; -//check if relative file link is requested and if the protocol is 'file://' + //check if relative file link is requested and if the protocol is 'file://' if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INET_PROT_FILE ) bSetRelative = true; @@ -4488,13 +4489,13 @@ we check in the following sequence: aLine.append( "/URI/URI" ); break; case PDFWriter::LaunchAction: -// now: -// if a launch action is requested and the hyperlink target has a fragment -// and the target file does not have a pdf extension, or it's not a 'file:://' protocol -// then force the uri action on it -// This code will permit the correct opening of application on web pages, the one that -// normally have fragments (but I may be wrong...) -// and will force the use of URI when the protocol is not file:// + // now: + // if a launch action is requested and the hyperlink target has a fragment + // and the target file does not have a pdf extension, or it's not a 'file:://' + // protocol then force the uri action on it + // This code will permit the correct opening of application on web pages, + // the one that normally have fragments (but I may be wrong...) + // and will force the use of URI when the protocol is not file:// if( (!aFragment.isEmpty() && !bTargetHasPDFExtension) || eTargetProtocol != INET_PROT_FILE ) { @@ -4508,7 +4509,8 @@ we check in the following sequence: break; } } -//fragment are encoded in the same way as in the named destination processing + + //fragment are encoded in the same way as in the named destination processing if( nSetGoToRMode ) { //add the fragment @@ -4528,14 +4530,14 @@ we check in the following sequence: } else { -// change the fragment to accommodate the bookmark (only if the file extension is PDF and -// the requested action is of the correct type) + // change the fragment to accommodate the bookmark (only if the file extension + // is PDF and the requested action is of the correct type) if(m_aContext.DefaultLinkAction == PDFWriter::URIActionDestination && bTargetHasPDFExtension && !aFragment.isEmpty() ) { OStringBuffer aLineLoc( 1024 ); appendDestinationName( aFragment , aLineLoc ); -//substitute the fragment + //substitute the fragment aTargetURL.SetMark( OStringToOUString(aLineLoc.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US) ); } OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE ); @@ -5094,9 +5096,9 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P aDA.append( m_aBuiltinFonts[nBest].getNameObject() ); aDA.append( " 0 Tf" ); rBox.m_aDAString = aDA.makeStringAndClear(); -//to encrypt this (el) + //to encrypt this (el) rBox.m_aMKDict = "/CA"; -//after this assignement, to m_aMKDic cannot be added anything + //after this assignement, to m_aMKDic cannot be added anything rBox.m_aMKDictCAString = "l"; rBox.m_aRect = aCheckRect; @@ -5499,7 +5501,7 @@ bool PDFWriterImpl::emitWidgetAnnotations() { aLine.append( "/MK<<" ); aLine.append( rWidget.m_aMKDict ); -//add the CA string, encrypting it + //add the CA string, encrypting it appendLiteralStringEncrypt(rWidget.m_aMKDictCAString, rWidget.m_nObject, aLine); aLine.append( ">>\n" ); } @@ -5549,16 +5551,16 @@ bool PDFWriterImpl::emitCatalog() sal_Int32 nOutlineDict = emitOutline(); - //emit Output intent i59651 + // emit Output intent i59651 sal_Int32 nOutputIntentObject = emitOutputIntent(); - //emit metadata + // emit metadata sal_Int32 nMetadataObject = emitDocumentMetadata(); sal_Int32 nStructureDict = 0; if(m_aStructure.size() > 1) { -///check if dummy structure containers are needed + // check if dummy structure containers are needed addInternalStructureContainer(m_aStructure[0]); nStructureDict = m_aStructure[0].m_nObject = createObject(); emitStructure( m_aStructure[ 0 ] ); @@ -5638,7 +5640,7 @@ bool PDFWriterImpl::emitCatalog() aLine.append( nTreeNode ); aLine.append( " 0 R\n" ); //--->i56629 -//check if there are named destinations to emit (root must be inside the catalog) + // check if there are named destinations to emit (root must be inside the catalog) if( nNamedDestinationsDictionary ) { aLine.append("/Dests "); @@ -5657,7 +5659,7 @@ bool PDFWriterImpl::emitCatalog() aLine.append( "/PageLayout/OneColumn\n" ); break; case PDFWriter::ContinuousFacing : -//the flag m_aContext.FirstPageLeft below is used to set the page on the left side + // the flag m_aContext.FirstPageLeft below is used to set the page on the left side aLine.append( "/PageLayout/TwoColumnRight\n" );//odd page on the right side break; } @@ -5727,7 +5729,8 @@ bool PDFWriterImpl::emitCatalog() aLine.append( "]\n" ); break; } -// viewer preferences, if we had some, then emit + + // viewer preferences, if we had some, then emit if( m_aContext.HideViewerToolbar || ( m_aContext.Version > PDFWriter::PDF_1_3 && !m_aContext.DocumentInfo.Title.isEmpty() && m_aContext.DisplayPDFDocumentTitle ) || m_aContext.HideViewerMenubar || @@ -5839,7 +5842,7 @@ bool PDFWriterImpl::emitCatalog() } //--->i59651 -//check if there is a Metadata object + //check if there is a Metadata object if( nOutputIntentObject ) { aLine.append("/OutputIntents["); @@ -6207,12 +6210,12 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() if( nCount <= 0 ) return 0;//define internal error -//get the object number for all the destinations + //get the object number for all the destinations sal_Int32 nObject = createObject(); if( updateObject( nObject ) ) { -//emit the dictionary + //emit the dictionary OStringBuffer aLine( 1024 ); aLine.append( nObject ); aLine.append( " 0 obj\n" @@ -6222,10 +6225,10 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() for( nDestID = 0; nDestID < nCount; nDestID++ ) { const PDFNamedDest& rDest = m_aNamedDests[ nDestID ]; -// In order to correctly function both under an Internet browser and -// directly with a reader (provided the reader has the feature) we -// need to set the name of the destination the same way it will be encoded -// in an Internet link + // In order to correctly function both under an Internet browser and + // directly with a reader (provided the reader has the feature) we + // need to set the name of the destination the same way it will be encoded + // in an Internet link INetURLObject aLocalURL( OUString( "http://ahost.ax" ) ); //dummy location, won't be used aLocalURL.SetMark( rDest.m_aDestName ); @@ -6286,8 +6289,8 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() } aLine.append( "]\n" ); } -//close + //close aLine.append( ">>\nendobj\n\n" ); if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) ) nObject = 0; @@ -6306,7 +6309,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() if( !m_bIsPDF_A1 ) return 0; -//emit the sRGB standard profile, in ICC format, in a stream, per IEC61966-2.1 + //emit the sRGB standard profile, in ICC format, in a stream, per IEC61966-2.1 OStringBuffer aLine( 1024 ); sal_Int32 nICCObject = createObject(); @@ -6323,13 +6326,13 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() aLine.append( ">>\nstream\n" ); CHECK_RETURN( updateObject( nICCObject ) ); CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) ); -//get file position + //get file position sal_uInt64 nBeginStreamPos = 0; osl_getFilePos( m_aFile, &nBeginStreamPos ); beginCompression(); checkAndEnableStreamEncryption( nICCObject ); cmsHPROFILE hProfile = cmsCreate_sRGBProfile(); -//force ICC profile version 2.1 + //force ICC profile version 2.1 cmsSetProfileVersion(hProfile, 2.1); cmsUInt32Number nBytesNeeded = 0; cmsSaveProfileToMem(hProfile, NULL, &nBytesNeeded); @@ -6350,7 +6353,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() return 0 ; aLine.setLength( 0 ); -//emit the stream length object + //emit the stream length object CHECK_RETURN( updateObject( nStreamLengthObject ) ); aLine.setLength( 0 ); aLine.append( nStreamLengthObject ); @@ -6360,7 +6363,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) ); aLine.setLength( 0 ); -//emit the OutputIntent dictionary + //emit the OutputIntent dictionary sal_Int32 nOIObject = createObject(); CHECK_RETURN( updateObject( nOIObject ) ); aLine.append( nOIObject ); @@ -6419,23 +6422,23 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( updateObject( nObject ) ) { -// the following string are written in UTF-8 unicode + // the following string are written in UTF-8 unicode OStringBuffer aMetadataStream( 8192 ); aMetadataStream.append( "<?xpacket begin=\"" ); -// these lines write Unicode "zero width non-breaking space character" (U+FEFF) -// (aka byte-order mark ) used as a byte-order marker. + // these lines write Unicode "zero width non-breaking space character" (U+FEFF) + // (aka byte-order mark ) used as a byte-order marker. aMetadataStream.append( OUStringToOString( OUString( sal_Unicode( 0xFEFF ) ), RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n" ); aMetadataStream.append( "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\">\n" ); aMetadataStream.append( " <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" ); -//PDF/A part ( ISO 19005-1:2005 - 6.7.11 ) + //PDF/A part ( ISO 19005-1:2005 - 6.7.11 ) aMetadataStream.append( " <rdf:Description rdf:about=\"\"\n" ); aMetadataStream.append( " xmlns:pdfaid=\"http://www.aiim.org/pdfa/ns/id/\">\n" ); aMetadataStream.append( " <pdfaid:part>1</pdfaid:part>\n" ); aMetadataStream.append( " <pdfaid:conformance>A</pdfaid:conformance>\n" ); aMetadataStream.append( " </rdf:Description>\n" ); -//... Dublin Core properties go here + //... Dublin Core properties go here if( !m_aContext.DocumentInfo.Title.isEmpty() || !m_aContext.DocumentInfo.Author.isEmpty() || !m_aContext.DocumentInfo.Subject.isEmpty() ) @@ -6444,7 +6447,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n" ); if( !m_aContext.DocumentInfo.Title.isEmpty() ) { -// this is according to PDF/A-1, technical corrigendum 1 (2007-04-01) + // this is according to PDF/A-1, technical corrigendum 1 (2007-04-01) aMetadataStream.append( " <dc:title>\n" ); aMetadataStream.append( " <rdf:Alt>\n" ); aMetadataStream.append( " <rdf:li xml:lang=\"x-default\">" ); @@ -6469,7 +6472,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() } if( !m_aContext.DocumentInfo.Subject.isEmpty() ) { -// this is according to PDF/A-1, technical corrigendum 1 (2007-04-01) + // this is according to PDF/A-1, technical corrigendum 1 (2007-04-01) aMetadataStream.append( " <dc:description>\n" ); aMetadataStream.append( " <rdf:Alt>\n" ); aMetadataStream.append( " <rdf:li xml:lang=\"x-default\">" ); @@ -6483,7 +6486,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " </rdf:Description>\n" ); } -//... PDF properties go here + //... PDF properties go here if( !m_aContext.DocumentInfo.Producer.isEmpty() || !m_aContext.DocumentInfo.Keywords.isEmpty() ) { @@ -6518,7 +6521,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( OUStringToOString( aCreator , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</xmp:CreatorTool>\n" ); } -//creation date + //creation date aMetadataStream.append( " <xmp:CreateDate>" ); aMetadataStream.append( m_aCreationMetaDateString ); aMetadataStream.append( "</xmp:CreateDate>\n" ); @@ -6527,7 +6530,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " </rdf:RDF>\n" ); aMetadataStream.append( "</x:xmpmeta>\n" ); -//add the padding + //add the padding for( sal_Int32 nSpaces = 1; nSpaces <= 2100; nSpaces++ ) { aMetadataStream.append( " " ); @@ -6547,7 +6550,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataObj.append( (sal_Int32) aMetadataStream.getLength() ); aMetadataObj.append( ">>\nstream\n" ); CHECK_RETURN( writeBuffer( aMetadataObj.getStr(), aMetadataObj.getLength() ) ); -//emit the stream + //emit the stream CHECK_RETURN( writeBuffer( aMetadataStream.getStr(), aMetadataStream.getLength() ) ); aMetadataObj.setLength( 0 ); @@ -6571,9 +6574,9 @@ bool PDFWriterImpl::emitTrailer() if( m_aContext.Encryption.Encrypt() ) { -//emit the security information -//must be emitted as indirect dictionary object, since -//Acrobat Reader 5 works only with this kind of implementation + //emit the security information + //must be emitted as indirect dictionary object, since + //Acrobat Reader 5 works only with this kind of implementation nSecObject = createObject(); if( updateObject( nSecObject ) ) |