summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/dump/biffdumper.cxx17
-rw-r--r--oox/source/dump/biffdumper.ini14
-rw-r--r--oox/source/xls/commentsbuffer.cxx116
-rwxr-xr-xoox/source/xls/drawingmanager.cxx2
-rw-r--r--oox/source/xls/worksheetfragment.cxx5
5 files changed, 117 insertions, 37 deletions
diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx
index 3e9e1d77d5c2..718a8897d641 100644
--- a/oox/source/dump/biffdumper.cxx
+++ b/oox/source/dump/biffdumper.cxx
@@ -2520,6 +2520,8 @@ void WorkbookStreamObject::implDumpRecordBody()
{
dumpHex< sal_uInt16 >( "flags", "NOTE-FLAGS" );
dumpDec< sal_uInt16 >( "obj-id" );
+ dumpUniString( "author" );
+ dumpUnused( 1 );
}
else
{
@@ -2529,6 +2531,21 @@ void WorkbookStreamObject::implDumpRecordBody()
}
break;
+ case BIFF_ID_NOTESOUND:
+ dumpHex< sal_uInt32 >( "identifier" );
+ dumpDec< sal_uInt32 >( "total-data-size" );
+ dumpDec< sal_uInt32 >( "wave-data-size" );
+ if( dumpDec< sal_uInt32 >( "fmt-size" ) >= 16 )
+ {
+ dumpDec< sal_uInt16 >( "format", "NOTESOUND-FORMAT" );
+ dumpDec< sal_uInt16 >( "channels" );
+ dumpDec< sal_uInt32 >( "sampling-rate" );
+ dumpDec< sal_uInt32 >( "data-rate" );
+ dumpDec< sal_uInt16 >( "data-block-size" );
+ dumpDec< sal_uInt16 >( "bits-per-sample" );
+ }
+ break;
+
case BIFF2_ID_NUMBER:
case BIFF3_ID_NUMBER:
dumpCellHeader( nRecId == BIFF2_ID_NUMBER );
diff --git a/oox/source/dump/biffdumper.ini b/oox/source/dump/biffdumper.ini
index 18e8cd87e551..d570fcdcf515 100644
--- a/oox/source/dump/biffdumper.ini
+++ b/oox/source/dump/biffdumper.ini
@@ -324,7 +324,7 @@ multilist=RECORD-NAMES-BIFF4
exclude=0x0206,0x0209,0x001E,0x0243
0x0085=SHEET
0x0088=,,,,,,SHEETSOFFSET,SHEETHEADER
- 0x0090=,,,,,SOUND,SYNC
+ 0x0090=,,,,,,NOTESOUND,SYNC
0x0098=LPR,STANDARDWIDTH,FNGROUPNAME,,FNGROUPCOUNT,,,
0x00A0=SCL,PAGESETUP,FNPROTO,PROJEXTSHEET,,,,
0x00A8=DRAGDROP,COORDLIST,,GCW,,,,
@@ -1441,6 +1441,18 @@ shortlist=IMGDATA-ENV,1,windows,apple
flagslist=NOTE-FLAGS-BIFF8
0x0002=visible
+ 0x0080=row-hidden
+ 0x0100=col-hidden
+end
+
+# NOTESOUND ------------------------------------------------------------------
+
+constlist=NOTESOUND-FORMAT
+ 1=pcm
+ 3=ieee-float
+ 6=a-law
+ 7=mu-law
+ 0xFFFE=extensible
end
# OBJ ------------------------------------------------------------------------
diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
index f0d4eb63611c..8b03be299a50 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/oox/source/xls/commentsbuffer.cxx
@@ -36,6 +36,7 @@
#include "oox/xls/addressconverter.hxx"
#include "oox/xls/biffinputstream.hxx"
#include "oox/xls/drawingfragment.hxx"
+#include "oox/xls/drawingmanager.hxx"
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
@@ -56,8 +57,18 @@ namespace xls {
// ============================================================================
+namespace {
+
+const sal_uInt16 BIFF_NOTE_VISIBLE = 0x0002;
+
+} // namespace
+
+// ============================================================================
+
CommentModel::CommentModel() :
- mnAuthorId( -1 )
+ mnAuthorId( -1 ),
+ mnObjId( BIFF_OBJ_INVALID_ID ),
+ mbVisible( false )
{
}
@@ -86,33 +97,29 @@ void Comment::importComment( RecordInputStream& rStrm )
void Comment::importNote( BiffInputStream& rStrm )
{
BinAddress aBinAddr;
- sal_uInt16 nTotalLen;
- rStrm >> aBinAddr >> nTotalLen;
+ rStrm >> aBinAddr;
// cell range will be checked while inserting the comment into the document
getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, BinRange( aBinAddr ), getSheetIndex() );
- RichStringRef xNoteText = createText();
- sal_uInt16 nPartLen = ::std::min( nTotalLen, static_cast< sal_uInt16 >( rStrm.getRemaining() ) );
- xNoteText->importCharArray( rStrm, nPartLen, getTextEncoding() );
-
- nTotalLen = nTotalLen - nPartLen; // operator-=() gives compiler warning
- while( (nTotalLen > 0) && (rStrm.getNextRecId() == BIFF_ID_NOTE) && rStrm.startNextRecord() )
+ // remaining record data is BIFF dependent
+ switch( getBiff() )
{
- rStrm >> aBinAddr >> nPartLen;
- OSL_ENSURE( aBinAddr.mnRow == 0xFFFF, "Comment::importNote - missing continuation NOTE record" );
- if( aBinAddr.mnRow == 0xFFFF )
- {
- OSL_ENSURE( nPartLen <= nTotalLen, "Comment::importNote - string too long" );
- // call to RichString::importCharArray() appends new text portion
- xNoteText->importCharArray( rStrm, nPartLen, getTextEncoding() );
- nTotalLen = nTotalLen - ::std::min( nTotalLen, nPartLen );
- }
- else
- {
- // seems to be a new note, rewind record, so worksheet fragment loop will find it
- rStrm.rewindRecord();
- nTotalLen = 0;
- }
+ case BIFF2:
+ case BIFF3:
+ importNoteBiff2( rStrm );
+ break;
+ case BIFF4:
+ case BIFF5:
+ importNoteBiff2( rStrm );
+ // in BIFF4 and BIFF5, comments can have an associated sound
+ if( (rStrm.getNextRecId() == BIFF_ID_NOTESOUND) && rStrm.startNextRecord() )
+ importNoteSound( rStrm );
+ break;
+ case BIFF8:
+ importNoteBiff8( rStrm );
+ break;
+ case BIFF_UNKNOWN:
+ break;
}
}
@@ -135,12 +142,15 @@ void Comment::finalizeImport()
Reference< XSheetAnnotations > xAnnos( xAnnosSupp->getAnnotations(), UNO_SET_THROW );
// non-empty string required by note implementation (real text will be added below)
xAnnos->insertNew( aNotePos, OUString( sal_Unicode( ' ' ) ) );
- // receive craeted note from cell (insertNew does not return the note)
+
+ // receive created note from cell (insertNew does not return the note)
Reference< XSheetAnnotationAnchor > xAnnoAnchor( getCell( aNotePos ), UNO_QUERY_THROW );
Reference< XSheetAnnotation > xAnno( xAnnoAnchor->getAnnotation(), UNO_SET_THROW );
Reference< XSheetAnnotationShapeSupplier > xAnnoShapeSupp( xAnno, UNO_QUERY_THROW );
Reference< XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), UNO_SET_THROW );
- // convert shape formatting
+
+ // convert shape formatting and visibility
+ sal_Bool bVisible = sal_True;
switch( getFilterType() )
{
case FILTER_OOX:
@@ -150,17 +160,17 @@ void Comment::finalizeImport()
pNoteShape->convertFormatting( xAnnoShape );
// visibility
const ::oox::vml::ShapeModel::ShapeClientDataPtr& rxClientData = pNoteShape->getShapeModel().mxClientData;
- bool bVisible = rxClientData.get() && rxClientData->mbVisible;
- xAnno->setIsVisible( bVisible );
+ bVisible = rxClientData.get() && rxClientData->mbVisible;
}
break;
case FILTER_BIFF:
- // notes are always hidden and unformatted in BIFF3-BIFF5
- xAnno->setIsVisible( sal_False );
+ bVisible = maModel.mbVisible;
break;
case FILTER_UNKNOWN:
break;
}
+ xAnno->setIsVisible( bVisible );
+
// insert text and convert text formatting
maModel.mxText->finalizeImport();
Reference< XText > xAnnoText( xAnnoShape, UNO_QUERY_THROW );
@@ -171,6 +181,52 @@ void Comment::finalizeImport()
}
}
+// private --------------------------------------------------------------------
+
+void Comment::importNoteBiff2( BiffInputStream& rStrm )
+{
+ sal_uInt16 nTotalLen;
+ rStrm >> nTotalLen;
+ sal_uInt16 nPartLen = ::std::min( nTotalLen, static_cast< sal_uInt16 >( rStrm.getRemaining() ) );
+ RichStringRef xNoteText = createText();
+ xNoteText->importCharArray( rStrm, nPartLen, getTextEncoding() );
+
+ nTotalLen = nTotalLen - nPartLen; // operator-=() gives compiler warning
+ while( (nTotalLen > 0) && (rStrm.getNextRecId() == BIFF_ID_NOTE) && rStrm.startNextRecord() )
+ {
+ sal_uInt16 nMarker;
+ rStrm >> nMarker;
+ rStrm.skip( 2 );
+ rStrm >> nPartLen;
+ OSL_ENSURE( nMarker == 0xFFFF, "Comment::importNoteBiff2 - missing continuation NOTE record" );
+ if( nMarker == 0xFFFF )
+ {
+ OSL_ENSURE( nPartLen <= nTotalLen, "Comment::importNoteBiff2 - string too long" );
+ // call to RichString::importCharArray() appends new text portion
+ xNoteText->importCharArray( rStrm, nPartLen, getTextEncoding() );
+ nTotalLen = nTotalLen - ::std::min( nTotalLen, nPartLen );
+ }
+ else
+ {
+ // seems to be a new note, rewind record, so worksheet fragment loop will find it
+ rStrm.rewindRecord();
+ nTotalLen = 0;
+ }
+ }
+}
+
+void Comment::importNoteBiff8( BiffInputStream& rStrm )
+{
+ sal_uInt16 nFlags;
+ rStrm >> nFlags >> maModel.mnObjId;
+ maModel.maAuthor = rStrm.readUniString();
+ maModel.mbVisible = getFlag( nFlags, BIFF_NOTE_VISIBLE );
+}
+
+void Comment::importNoteSound( BiffInputStream& /*rStrm*/ )
+{
+}
+
// ============================================================================
CommentsBuffer::CommentsBuffer( const WorksheetHelper& rHelper ) :
diff --git a/oox/source/xls/drawingmanager.cxx b/oox/source/xls/drawingmanager.cxx
index 0ef734aa86a0..1016a8fa9da9 100755
--- a/oox/source/xls/drawingmanager.cxx
+++ b/oox/source/xls/drawingmanager.cxx
@@ -51,8 +51,6 @@ namespace {
// OBJ record -----------------------------------------------------------------
-const sal_uInt16 BIFF_OBJ_INVALID_ID = 0;
-
const sal_uInt16 BIFF_OBJTYPE_GROUP = 0;
const sal_uInt16 BIFF_OBJTYPE_LINE = 1;
const sal_uInt16 BIFF_OBJTYPE_RECTANGLE = 2;
diff --git a/oox/source/xls/worksheetfragment.cxx b/oox/source/xls/worksheetfragment.cxx
index cd017cab9cf6..72137a1b82d2 100644
--- a/oox/source/xls/worksheetfragment.cxx
+++ b/oox/source/xls/worksheetfragment.cxx
@@ -804,6 +804,7 @@ bool BiffWorksheetFragment::importFragment()
case BIFF_ID_HORPAGEBREAKS: importPageBreaks( true ); break;
case BIFF_ID_ITERATION: rWorkbookSett.importIteration( mrStrm ); break;
case BIFF_ID_LEFTMARGIN: rPageSett.importLeftMargin( mrStrm ); break;
+ case BIFF_ID_NOTE: importNote(); break;
case BIFF_ID_PANE: rSheetViewSett.importPane( mrStrm ); break;
case BIFF_ID_PASSWORD: rWorksheetSett.importPassword( mrStrm ); break;
case BIFF_ID_PRINTGRIDLINES: rPageSett.importPrintGridLines( mrStrm ); break;
@@ -823,7 +824,6 @@ bool BiffWorksheetFragment::importFragment()
case BIFF_ID_COLUMNDEFAULT: importColumnDefault(); break;
case BIFF_ID_COLWIDTH: importColWidth(); break;
case BIFF2_ID_DEFROWHEIGHT: importDefRowHeight(); break;
- case BIFF_ID_NOTE: importNote(); break;
case BIFF2_ID_WINDOW2: rSheetViewSett.importWindow2( mrStrm ); break;
}
break;
@@ -834,7 +834,6 @@ bool BiffWorksheetFragment::importFragment()
case BIFF_ID_DEFCOLWIDTH: importDefColWidth(); break;
case BIFF3_ID_DEFROWHEIGHT: importDefRowHeight(); break;
case BIFF_ID_HCENTER: rPageSett.importHorCenter( mrStrm ); break;
- case BIFF_ID_NOTE: importNote(); break;
case BIFF_ID_OBJ: rDrawing.importObj( mrStrm ); break;
case BIFF_ID_OBJECTPROTECT: rWorksheetSett.importObjectProtect( mrStrm ); break;
case BIFF_ID_SAVERECALC: rWorkbookSett.importSaveRecalc( mrStrm ); break;
@@ -851,7 +850,6 @@ bool BiffWorksheetFragment::importFragment()
case BIFF_ID_COLINFO: importColInfo(); break;
case BIFF3_ID_DEFROWHEIGHT: importDefRowHeight(); break;
case BIFF_ID_HCENTER: rPageSett.importHorCenter( mrStrm ); break;
- case BIFF_ID_NOTE: importNote(); break;
case BIFF_ID_OBJ: rDrawing.importObj( mrStrm ); break;
case BIFF_ID_OBJECTPROTECT: rWorksheetSett.importObjectProtect( mrStrm ); break;
case BIFF_ID_PAGESETUP: rPageSett.importPageSetup( mrStrm ); break;
@@ -870,7 +868,6 @@ bool BiffWorksheetFragment::importFragment()
case BIFF3_ID_DEFROWHEIGHT: importDefRowHeight(); break;
case BIFF_ID_HCENTER: rPageSett.importHorCenter( mrStrm ); break;
case BIFF_ID_MERGEDCELLS: importMergedCells(); break; // #i62300# also in BIFF5
- case BIFF_ID_NOTE: importNote(); break;
case BIFF_ID_OBJ: rDrawing.importObj( mrStrm ); break;
case BIFF_ID_OBJECTPROTECT: rWorksheetSett.importObjectProtect( mrStrm ); break;
case BIFF_ID_PAGESETUP: rPageSett.importPageSetup( mrStrm ); break;
generated by cgit (git 2.34.1) at 2025-01-10 10:46:37 +0000