vcl: remove or rename too long methods names in VectorGraphicData

Change-Id: I8a64d27927b608afdc7996e0b0bbc59a58fde90f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108443
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

4 files changed, 15 insertions, 15 deletions

diff --git a/vcl/source/gdi/TypeSerializer.cxx b/vcl/source/gdi/TypeSerializer.cxx
index 5a360f15675a..fb354d7f3dd0 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -362,7 +362,7 @@ void TypeSerializer::writeGraphic(const Graphic& rGraphic)
                     // this is used e.g. in swapping out graphic data and in transporting it over UNO API
                     // as sequence of bytes, but AFAIK not written anywhere to any kind of file, so it should be
                     // no problem to extend it; only used at runtime
-                    switch (pVectorGraphicData->getVectorGraphicDataType())
+                    switch (pVectorGraphicData->getType())
                     {
                         case VectorGraphicDataType::Wmf:
                         {
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 07f0df76acb0..fe296fc510cf 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -672,8 +672,8 @@ const GDIMetaFile& ImpGraphic::ImplGetGDIMetaFile() const
     ensureAvailable();
     if (!maMetaFile.GetActionSize()
         && maVectorGraphicData
-        && (VectorGraphicDataType::Emf == maVectorGraphicData->getVectorGraphicDataType()
-            || VectorGraphicDataType::Wmf == maVectorGraphicData->getVectorGraphicDataType()))
+        && (VectorGraphicDataType::Emf == maVectorGraphicData->getType()
+            || VectorGraphicDataType::Wmf == maVectorGraphicData->getType()))
     {
         // If we have a Emf/Wmf VectorGraphic object, we
         // need a way to get the Metafile data out of the primitive
@@ -1180,7 +1180,7 @@ bool ImpGraphic::swapOutGraphic(SvStream& rStream)
                 // this is used e.g. in swapping out graphic data and in transporting it over UNO API
                 // as sequence of bytes, but AFAIK not written anywhere to any kind of file, so it should be
                 // no problem to extend it; only used at runtime
-                switch (maVectorGraphicData->getVectorGraphicDataType())
+                switch (maVectorGraphicData->getType())
                 {
                     case VectorGraphicDataType::Wmf:
                     {
@@ -1204,7 +1204,7 @@ bool ImpGraphic::swapOutGraphic(SvStream& rStream)
                     }
                 }
 
-                rStream.WriteUInt32(maVectorGraphicData->getVectorGraphicDataArrayLength());
+                rStream.WriteUInt32(maVectorGraphicData->getBinaryDataContainer().getSize());
 
                 rStream.WriteBytes(
                     maVectorGraphicData->getBinaryDataContainer().getData(),
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 7339c4cbeb19..405965cbacbd 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9000,7 +9000,7 @@ void PDFWriterImpl::createEmbeddedFile(const Graphic& rGraphic, ReferenceXObject
     // no pdf data.
     rEmit.m_nBitmapObject = nBitmapObject;
 
-    if (!rGraphic.getVectorGraphicData() || rGraphic.getVectorGraphicData()->getVectorGraphicDataType() != VectorGraphicDataType::Pdf)
+    if (!rGraphic.getVectorGraphicData() || rGraphic.getVectorGraphicData()->getType() != VectorGraphicDataType::Pdf)
         return;
 
     BinaryDataContainer const & rDataContainer = rGraphic.getVectorGraphicData()->getBinaryDataContainer();
@@ -9073,7 +9073,7 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
     {
         m_aJPGs.emplace( m_aJPGs.begin() );
         JPGEmit& rEmit = m_aJPGs.front();
-        if (!rGraphic.getVectorGraphicData() || rGraphic.getVectorGraphicData()->getVectorGraphicDataType() != VectorGraphicDataType::Pdf || m_aContext.UseReferenceXObject)
+        if (!rGraphic.getVectorGraphicData() || rGraphic.getVectorGraphicData()->getType() != VectorGraphicDataType::Pdf || m_aContext.UseReferenceXObject)
             rEmit.m_nObject = createObject();
         rEmit.m_aID         = aID;
         rEmit.m_pStream = std::move( pStream );
@@ -9177,7 +9177,7 @@ const BitmapEmit& PDFWriterImpl::createBitmapEmit( const BitmapEx& i_rBitmap, co
         m_aBitmaps.push_front( BitmapEmit() );
         m_aBitmaps.front().m_aID        = aID;
         m_aBitmaps.front().m_aBitmap    = aBitmap;
-        if (!rGraphic.getVectorGraphicData() || rGraphic.getVectorGraphicData()->getVectorGraphicDataType() != VectorGraphicDataType::Pdf || m_aContext.UseReferenceXObject)
+        if (!rGraphic.getVectorGraphicData() || rGraphic.getVectorGraphicData()->getType() != VectorGraphicDataType::Pdf || m_aContext.UseReferenceXObject)
             m_aBitmaps.front().m_nObject = createObject();
         createEmbeddedFile(rGraphic, m_aBitmaps.front().m_aReferenceXObject, m_aBitmaps.front().m_nObject);
         it = m_aBitmaps.begin();
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 5e027e0bcd34..2afe12e97fbd 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -113,9 +113,9 @@ static size_t estimateSize(
 
 bool VectorGraphicData::operator==(const VectorGraphicData& rCandidate) const
 {
-    if (getVectorGraphicDataType() == rCandidate.getVectorGraphicDataType())
+    if (getType() == rCandidate.getType())
     {
-        if (getVectorGraphicDataArrayLength() == rCandidate.getVectorGraphicDataArrayLength())
+        if (maDataContainer.getSize() == rCandidate.maDataContainer.getSize())
         {
             if (0 == memcmp(
                 maDataContainer.getData(),
@@ -142,7 +142,7 @@ void VectorGraphicData::setWmfExternalHeader(const WmfExternal& aExtHeader)
 
 void VectorGraphicData::ensurePdfReplacement()
 {
-    assert(getVectorGraphicDataType() == VectorGraphicDataType::Pdf);
+    assert(getType() == VectorGraphicDataType::Pdf);
 
     if (!maReplacement.IsEmpty())
         return; // nothing to do
@@ -166,7 +166,7 @@ void VectorGraphicData::ensureReplacement()
 
     // shortcut for PDF - PDFium can generate the replacement bitmap for us
     // directly
-    if (getVectorGraphicDataType() == VectorGraphicDataType::Pdf)
+    if (getType() == VectorGraphicDataType::Pdf)
     {
         ensurePdfReplacement();
         return;
@@ -191,7 +191,7 @@ void VectorGraphicData::ensureSequenceAndRange()
     // create Vector Graphic Data interpreter
     uno::Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext());
 
-    switch (getVectorGraphicDataType())
+    switch (getType())
     {
         case VectorGraphicDataType::Svg:
         {
@@ -309,7 +309,7 @@ VectorGraphicData::VectorGraphicData(
     maSequence(),
     maReplacement(),
     mNestedBitmapSize(0),
-    meVectorGraphicDataType(eVectorDataType),
+    meType(eVectorDataType),
     mnPageIndex(nPageIndex)
 {
 }
@@ -322,7 +322,7 @@ VectorGraphicData::VectorGraphicData(
     maSequence(),
     maReplacement(),
     mNestedBitmapSize(0),
-    meVectorGraphicDataType(eVectorDataType),
+    meType(eVectorDataType),
     mnPageIndex(-1)
 {
     SvFileStream rIStm(rPath, StreamMode::STD_READ);